gentoo resync : 15.01.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
commit: 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree: e1810a4b135afce04b34862ef0fab2bfaeb8aeca /net-analyzer
parent: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
324 files changed, 3442 insertions, 2943 deletions
diff --git a/net-analyzer/2ping/2ping-4.2.ebuild b/net-analyzer/2ping/2ping-4.2.ebuild
index 87e4e3add809..71c1f09691ce 100644
--- a/net-analyzer/2ping/2ping-4.2.ebuild
+++ b/net-analyzer/2ping/2ping-4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/net-analyzer/2ping/2ping-4.3.ebuild b/net-analyzer/2ping/2ping-4.3.ebuild
index bc1801958697..98a0f53291f4 100644
--- a/net-analyzer/2ping/2ping-4.3.ebuild
+++ b/net-analyzer/2ping/2ping-4.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/net-analyzer/2ping/Manifest b/net-analyzer/2ping/Manifest
index 23cf019e6d34..62f48497ccbd 100644
--- a/net-analyzer/2ping/Manifest
+++ b/net-analyzer/2ping/Manifest
@@ -2,6 +2,6 @@ AUX 2pingd 692 BLAKE2B f393bc602a4e39f77970946926bae178f9181476f7331b9a91f1dddc6
 AUX 2pingd.conf 57 BLAKE2B 79c2a05661e342d5a5c3903071d42864d3185d6f387a6b73f129a70cadfadf081f43d9bdfea22281170b0ad27ec17f9b3612cf40b570390f44f845d7ca4555d0 SHA512 c8c666116e841b86a1f17a891453e6ea25976ad485b8299062971b45395420dd46ecc9ac36cb1de5000207372f8586850f62c6178ece5f70732bf17ae9ab4af9
 DIST 2ping-4.2.tar.gz 70054 BLAKE2B 01759c9f0d2eb2bf08e92155a74e11aaf7bb83adb43942be70b8e525486bba6608ad021bb149376f246bdcb066958c7d9886a1e5ea63094d715c8b25fa2b9784 SHA512 8c6e9b4cefd92929e8d5247f2c4caecdfc281548596f96fbfe52f99dc122dd1d53470c303e85bc469f0a7910937085ad36c7f928cb295c8f3fce5f3455dec3d9
 DIST 2ping-4.3.tar.gz 70386 BLAKE2B 7a73508bdf5fef0d6ef99d1d6b8bfdee65740277ef0e17913e2070503c20bd4d9598a7d7353eb68dbe5c7380e49e465ddd49adba4899f95daead36bbc8514f69 SHA512 f7186fe5bed2f12593d62f85fe364c9dc571f8b0ad10f6766515470ea8f8ed32d439e580003e78494b4742a8224e2b30cc454f8275a4877d432eb76646334e77
-EBUILD 2ping-4.2.ebuild 628 BLAKE2B 25c8440858d8fd7a39aad68db490b04cfb9749b94240c516472cbc4e52084e82de9ace820fbe841708cafc3fd8bb1d346bf5000f85d624b419a670598627bdba SHA512 6719d8864f20c8fac0c125780dba45c08e95ee1fb2b1b631395cf93eaf7e5d4abe212055ab045e5e29adb8903e4a7d799d67a735d049a63c096239eecd11e8bb
-EBUILD 2ping-4.3.ebuild 628 BLAKE2B 7222cc05ca444b6313bf9d0a49ae578f0534c3712fb749d6592c4f4e7fbb1f2d74392dabeb36c122ad7c5ed17d62887f51d47767b8585abb0e4a049edba38f61 SHA512 f5d6e00d47bd1f28575d97645c566b124cc29c35435b50e2859862bad9ba7fce6c3f121a19449439cd53782649ebff156bccff8b16e93491c78e2778d23eec48
+EBUILD 2ping-4.2.ebuild 624 BLAKE2B 53e4efecd635c89dd92b66041b7a8ab25589b370a3dfffbaceda09f87e9918da969e761148ac5bef2014aa15510385cb4a86a99830dcbccb2dbe5102358490e8 SHA512 ff0cbe08db31810930778f9d6bd5635b0f97a25db1285614d861b4ac69dbc918493daf69d1e5052c353b8c621cf22eb7a560e378a9fb6b86ee6e61b390405913
+EBUILD 2ping-4.3.ebuild 624 BLAKE2B b4f77612a74996f3f7db254ca3a7e591eaacbfe9dc38b819eeb946a6225ce26c85c443f178560a3a5913a77f2d6a5b76708739c46c65fb0336184dbce9a2f073 SHA512 02b8a0b3039747511d8792d65702ba2af69e5b19e9d0d5e12d4dcf5f3abb6644d0db26a17e8bd05719d2dcf624a516124557e3df5b2484c7834e6059cd7c097a
 MISC metadata.xml 400 BLAKE2B 8de660bda8c58cc5c6e6027c7e52efbd03ef973594e85a90483f0bb0dd2fcdcc4ee7989cf8624e72f0e71f31daf5af05c345126b862cad1007c3a45a8122bcd4 SHA512 9d35147319cbab8e826a2f0a8badee2169e70b8a52065d8639f2326ff0bfe1717a5e8b5422072f71677e2e4a99ec14a7d6e688662f2342d7917499c35a686154
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index f048a776e006..81f7a9e621f4 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/alive/Manifest b/net-analyzer/alive/Manifest
index d2a4a37c53cc..8c2a0d8dfc87 100644
--- a/net-analyzer/alive/Manifest
+++ b/net-analyzer/alive/Manifest
@@ -1,4 +1,4 @@
 AUX alive-2.0.2-ping-test.patch 378 BLAKE2B 1adb452bce76cd0dee69c52fc0432148ce7f3267d2ecb96f1f4199543fb61a11a20f9738175a8edd47c5aea75f925e12e5e38bf564e8915b978928c66bcaed25 SHA512 6479364f35345aad12fcabf4f11f84a601740771e0e602afc757a39f45eaabdd0d5d6b3d3d95a5307edaef2e84250e4ba784a9757fa75bad21363735c14cfd78
 DIST alive-2.0.2.tar.xz 174936 BLAKE2B f3998d1cbf81d77be449cf1157bc570837b87fd15a860041273059de69536ff9cab8d00b8cb1191b2d6d692b41fb3fa5863248267a86ad542326f48c8ab43730 SHA512 7e9c88f62ab5c0248d1e42b81e2106f43fc9587543782623e8a564ab99fd1d4a55058a175dc46d25520454c07f732101c7e62248ce992d1a8a615f531b1c090e
-EBUILD alive-2.0.2.ebuild 535 BLAKE2B 69c5af5669ccd0dd8e92f2e5e98a770e1ee65ac0df6e8b2880cd60e7d96f64a7f679c027ea9d9c221aac9b3c9086ba2501c6274d4a48c6e9586df5a53860dd62 SHA512 a6b1b826070288fc1192a28cc8860e73610218611e9c36a0d21ca59420cc8a45582ef9113aede2e7fe28e6207d3b41a8625ce66f5e639e4d757b414d5515e374
+EBUILD alive-2.0.2-r1.ebuild 534 BLAKE2B 373d867ca88524aafd8e90352eb11975543b5a39abd4d7092b6ba3565bf17d42772fa52875563d123ef65df69318e8d26335597d91557eaa6d6fa75504fdd603 SHA512 3a74d3aa466c820b9e6646dcd10ede837177eea419ec0be6bbdde3546f7f7391a6808c532b2bea4e8109c1484fc71e1bc7ec1491691514d181200f541ff63264
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/alive/alive-2.0.2.ebuild b/net-analyzer/alive/alive-2.0.2-r1.ebuild
index 7c00e7498f3c..9ee866d5fd4c 100644
--- a/net-analyzer/alive/alive-2.0.2.ebuild
+++ b/net-analyzer/alive/alive-2.0.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils
+EAPI=7
+inherit autotools
 
 DESCRIPTION="a periodic ping program"
 HOMEPAGE="https://www.gnu.org/software/alive/"
@@ -11,9 +11,10 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
-IUSE=""
 
-COMMON_DEPEND="net-misc/iputils"
+COMMON_DEPEND="
+	net-misc/iputils
+"
 DEPEND="
 	app-arch/xz-utils
 	${COMMON_DEPEND}
@@ -22,8 +23,11 @@ RDEPEND="
 	dev-scheme/guile
 	${COMMON_DEPEND}
 "
+PATCHES=(
+	"${FILESDIR}"/${P}-ping-test.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-ping-test.patch
+	default
 	eautoreconf
 }
diff --git a/net-analyzer/apinger/Manifest b/net-analyzer/apinger/Manifest
index fa2bf3970753..8f768aa4a0a2 100644
--- a/net-analyzer/apinger/Manifest
+++ b/net-analyzer/apinger/Manifest
@@ -1,3 +1,3 @@
 DIST apinger-0.4.1.tar.gz 26328 BLAKE2B 72eb19c043642dc00e02f24bfd8f3f9f704cc8a2fb5b5937756706db561dd7dc5173706c7ede73dde778964a516b7b138fe664c243db5351ac440fc80244c843 SHA512 b8a67149f43da5b6e240dee97315c31a3e6257f1de70da81a6aa63d1e1d7d5bff0b54abe5085a57e90eb7789b7fa8b83c09a51411a6247a81b6f99de3d83120f
-EBUILD apinger-0.4.1.ebuild 723 BLAKE2B 1ac1c157e2f2ad10a8c50484dd0badfe1c9fa7f21a550b46ebb1155e83c4a039ba5f45f1a008755767668ce29391fb5af8bec55e28741d1979bbc65fa7e48dae SHA512 5d71d0686bf29d06fe35726d59b0925377c91e9a176cbfe87958453917a32b0ee853f61c5a6ba3ead9affb61856b418768ac7f4a9a60b219b139a6d8c8900ade
+EBUILD apinger-0.4.1.ebuild 746 BLAKE2B 99207dcc1472f12e2f777073b5a836054818e68ea9c85d21e78ed434ca2628258c6ea6193c36d0dc73a4e80178e21db9d61ea6a08bfa7b04cf47459ca8b9d803 SHA512 c7741f08b76a7e101d17f790d0353144346f29739081f873514e278480326551d722e5c5361659413f26a4cb27a250a253bcf72be2690eb674013a0e7d5ef2e8
 MISC metadata.xml 359 BLAKE2B 929365ca07ce887876998e51742a78e8f4a9250c42367ad458458d450b4f08ccc91d510bd6269b916f788ffb59c3ec61f0792722c83cfd54020b2913b7ea8773 SHA512 d4166ecf10d6c588adc68ccd871986e7de28191c76a18b45922925552d30534e1631b61974e21a477f9c9facedf698a964256f08b04ad3e0bbdfec87c5246d8b
diff --git a/net-analyzer/apinger/apinger-0.4.1.ebuild b/net-analyzer/apinger/apinger-0.4.1.ebuild
index 8b2eb5418a76..89174b065fcd 100644
--- a/net-analyzer/apinger/apinger-0.4.1.ebuild
+++ b/net-analyzer/apinger/apinger-0.4.1.ebuild
@@ -11,7 +11,7 @@ MY_P="${MY_PN}_${PV//./_}"
 
 DESCRIPTION="Alarm Pinger"
 HOMEPAGE="https://github.com/Jajcus/apinger/"
-SRC_URI="${HOMEPAGE}archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/Jajcus/apinger/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/argus/Manifest b/net-analyzer/argus/Manifest
index 86bbb2c5b682..d390e17b5f1c 100644
--- a/net-analyzer/argus/Manifest
+++ b/net-analyzer/argus/Manifest
@@ -4,5 +4,5 @@ AUX argus-3.0.8.1-disable-tcp-wrappers-automagic.patch 591 BLAKE2B 2a04cb018d385
 AUX argus-3.0.8.2-rpc.patch 1425 BLAKE2B c71d72db164a343114ac39f754cdd7a9d19bf4338ea809966c5de1de5a71d6c339a11021207c1c20f5029052e6ce7cc43298e227574a96369a9fee1c40adc3e2 SHA512 61136d8d736429a4e291f0a92e47bb02ec5706e0e9e8b68db4e5213baebff064427733edd054d163e582ed0288209d008b38b7f1ab77f54b1968f246b8c6db77
 AUX argus.initd 365 BLAKE2B 1b7841cd53679b10444a1da1af0f0226bc84c08e9e5427f964622c03f4a8661997cd2b31db35d804f7373ca89ca4eca006662c6d08d26d6b65d13c209ae92aa0 SHA512 54cbc2a0d92e5d0813ff6aecbf5f6d083e7de708a974af8aa90ce112e2d697b53b00e7918405973f487b2d9733bd2326a083ed13b52ee8dbbda4b06b73d95231
 DIST argus-3.0.8.2.tar.gz 524749 BLAKE2B 4d93fd8acd71b198da712961d75f0e813f5ed3fde841e77b8a10c3a9b89571902b7597969a4be12437c97ffc69ba5ebefaee8b684c5d2d4ce4f1309c1cfd1199 SHA512 146795880d8697e065ed23d2fbab226846d55db0b71945c5a4cab2896e48ceb6e1671ccb4e00dc3b0f984525bac4ced3773f3b9e70c3ea5f7c6972fe9bd94313
-EBUILD argus-3.0.8.2-r1.ebuild 2049 BLAKE2B 1168c4cc70b9d4abd9c255b19f930293f2bd025a670dc2aefbdc0ea6a8cefaff1744dc3f08fe651fc5230a8a0af58436cc008c4ee9d38bcfa080d701c275b000 SHA512 808d7edf1467798714a0eab02336baa6f223fc4c1ffcd707018135eb99856f109ea713b98326cd7c796083f2b62a743229806f848fa013af49339ce44c89277f
+EBUILD argus-3.0.8.2-r1.ebuild 2068 BLAKE2B 4abc49f4b8e0e3d9053a6914056c7c6ea2178f385360fd2b2eea2f41ce3b36d72f25cead041bf91a2c56e491a44bf29f1dfad5870cb189a85ef6b7facca04ba1 SHA512 67e0564bb467a658444508d3898c0f6e4b002c8ce6d0baa51c7de81caa5227eece17b402da8f79d4ffb3b50728a9c202ceabaec67d45a68641cf6b108d2c5e3a
 MISC metadata.xml 468 BLAKE2B ce716483a5c126030c044618343341e853b367516f0fb6142b5cf7140738a5950eec5fcc514a856dd119310d7a1e05adab9f4ac0e802e01ee873a6c81f14a2e4 SHA512 64c97706da7a48ebaf5d3bd9aecdd11b1eff9516d5e99993ba65217b169c503bb509fdf19ade828925c85a82573b186aab89991b5870161681c42985a244771f
diff --git a/net-analyzer/argus/argus-3.0.8.2-r1.ebuild b/net-analyzer/argus/argus-3.0.8.2-r1.ebuild
index 83eacad11e44..9eeb344b10ec 100644
--- a/net-analyzer/argus/argus-3.0.8.2-r1.ebuild
+++ b/net-analyzer/argus/argus-3.0.8.2-r1.ebuild
@@ -6,7 +6,7 @@ inherit autotools eutils user
 
 DESCRIPTION="network Audit Record Generation and Utilization System"
 HOMEPAGE="https://www.qosient.com/argus/"
-SRC_URI="${HOMEPAGE}dev/${P/_rc/.rc.}.tar.gz"
+SRC_URI="https://www.qosient.com/argus/dev/${P/_rc/.rc.}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/net-analyzer/arpon/Manifest b/net-analyzer/arpon/Manifest
index fb1db0ee2712..03735be3c8da 100644
--- a/net-analyzer/arpon/Manifest
+++ b/net-analyzer/arpon/Manifest
@@ -3,6 +3,6 @@ AUX arpon-2.7.2-etc.patch 356 BLAKE2B 5cbec9b24dfd2a75f1a743e7a08031945fbadb7f6f
 AUX arpon.confd 128 BLAKE2B 864417d8892d037f005123938b3ffd970c69f6ad06fdc6e031872250a126fb92a63ccb247e6f49a8e6e716a1138443df29d2838e5a1c73e44e04632977f78789 SHA512 1300ffd903366a5970c5c2b6b7a570ee6e1e696d18a5f16340c7f192c5ff4e41694a180e0d5ab86c1fb64bd015dab94eb52ef5ff429280b56f5ec4112abe3b11
 AUX arpon.initd 406 BLAKE2B b519b05207a2cf54301493d85a5b50205d27bacc5c4eb2dedb18ccc450a01b74b9d159da0c66b6aed20a31ec454747e0ab533906633cd8dc7ab6bdaaa9d44ca0 SHA512 5a889f94fa495ee63475a8ca2774b09247548a0a7170b32b0c74ed5808822818fda23516959ad4c3598ed39f31ad2a2ab68b81f00a715267b0d12e194532324a
 DIST ArpON-2.7.2.tar.gz 2780607 BLAKE2B 58d7a0db475658d90112441508d4c4d9babd601533a6ab9a22b24f07e037b6f3debcbe0f3c1f09a87b7e0cdf9217a38f52b85431db023d12b0f1ee58765e0bfb SHA512 7518f8f8920817725c9b3e0a6420190dcc101b1c0c7cd9eec50870b3f893fe2322eddc90cb71e9c3c35326b4e1730aa02797ca51775caa9401807da3978628b4
-EBUILD arpon-2.7.2-r1.ebuild 739 BLAKE2B c339647bd01e8d1b6dc4b2c60b13f06ed87f72ba0a9514265139cd5a4f82baf7505f97fd829b3bfa8a143b46a18fb0a0630cca47fd4cbdb563b9552eb0b2bfb1 SHA512 b8ea3e5c19ef796c3aae4206ebe022f1d2dd1424f23b9282fe65999f96ca38280bb832516c1035a5732806e25a096cd1aa1ecb2a0f4d310c58c593f978283622
+EBUILD arpon-2.7.2-r1.ebuild 727 BLAKE2B 66b92f7358754232dca8f710f3c261287466b060bd58ccbf4045c504001219a8f3492568e9be996a3895caaac16a3e1984183a5f2f958668e961ffef3e91cabe SHA512 10c3b49585e379bd8bda6e7199160be0b67b342a36cf17f11f27b03111bd2e3f53d97f0ceaae921b7d26b44437a8c6d99e50f7aa9887be5030ec0994477246ce
 EBUILD arpon-2.7.2.ebuild 884 BLAKE2B e83db5a744d62b0a7f7f3e7441a300345f81799617c93f220f320cb61f653c209aaa631fb0525d159c95337d83d339ca19e979a8cd3f4a35580e487c8085101d SHA512 4427110fc2ac7557d57d2bf9b453bb2b121ac5121e287d4273f1aea4bdc503ab38f64092c1776ca64d2ad66fddbeae4a25c82b53b98d6734b3a3347b070adbbe
 MISC metadata.xml 242 BLAKE2B ff85d6f7c94b7a327031d666c89344f6d69ed7a8c5cac45f89650c5f3aeb43edd3a4c7b5814ace420c7804a411235ba0f7deda58424e417681f74f9468e0ef0e SHA512 a01133ba691e36e58aa94e18a91db4a4a42b8ae621540319cab84241a07cc541263f753268ab759430699332a77018423c1a54d886d9c2fd3fab24537b64742d
diff --git a/net-analyzer/arpon/arpon-2.7.2-r1.ebuild b/net-analyzer/arpon/arpon-2.7.2-r1.ebuild
index 92f553b7ab10..2ccf4afb09f1 100644
--- a/net-analyzer/arpon/arpon-2.7.2-r1.ebuild
+++ b/net-analyzer/arpon/arpon-2.7.2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="ArpON (Arp handler inspectiON) is a portable Arp handler"
 
@@ -31,7 +31,7 @@ DOCS=( AUTHOR CHANGELOG )
 S="${WORKDIR}"/${MY_P}
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
 }
diff --git a/net-analyzer/bigeye/Manifest b/net-analyzer/bigeye/Manifest
index 35dfa7cbccb5..c24b47de0e13 100644
--- a/net-analyzer/bigeye/Manifest
+++ b/net-analyzer/bigeye/Manifest
@@ -1,5 +1,7 @@
 AUX bigeye-0.3-overflow.patch 364 BLAKE2B 35f659abba86474fb2d87eeb926952ba0e9c394770c17a964cc8d723de700484a889469f33b3d66f3c40df184dbfcd3d953c29c2ec13a4c4d833231fc0e97dbe SHA512 4076e00b11c5c11d432f52a536f6d32a6329b8946ea6a8db64d61c395728483e9631fd93d136390d3e34e7c05ce113f3b2e7ef2113f686bd0184b8a5cb436d18
 DIST bigeye-0.3-gcc34.diff.bz2 2774 BLAKE2B 51b1c4702b65b3e6b484d17e500b00d26bd137c74a8eb16b8521ffa621263ef89b650f1bdc967c50a8e5200cc857d42597e1f93279ec4acd01efe8ad9802cae0 SHA512 8ed54aa7b95aac8703e2bf99fde985cbbe7e62f7a6b549e58b2b54856336c5560c450a8c6ad9cbcdcd6bf61c842797c1abca001cfca20ff82614d8c328cab4ba
+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
 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
new file mode 100644
index 000000000000..e92408b8df42
--- /dev/null
+++ b/net-analyzer/bigeye/bigeye-0.3-r4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="network utility dump and simple honeypot utility"
+HOMEPAGE="http://violating.us/projects/bigeye/"
+SRC_URI="
+	http://violating.us/projects/bigeye/download/${P}.tgz
+	https://dev.gentoo.org/~jer/${P}-gcc34.patch.xz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+PATCHES=(
+	"${WORKDIR}"/${P}-gcc34.patch
+	"${FILESDIR}"/${P}-overflow.patch
+)
+
+src_prepare() {
+	default
+	sed -i README \
+		-e "s|-- /messages/|-- /usr/share/bigeye/messages/|g" \
+		|| die "sed README"
+}
+
+src_compile() {
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} src/bigeye.c src/emulate.c -o src/bigeye || die
+}
+
+src_install() {
+	dobin src/bigeye
+
+	insinto /usr/share/bigeye
+	doins sig.file
+	doins -r messages
+
+	dodoc README
+}
diff --git a/net-analyzer/braa/Manifest b/net-analyzer/braa/Manifest
index cf6140a104ac..10252371a172 100644
--- a/net-analyzer/braa/Manifest
+++ b/net-analyzer/braa/Manifest
@@ -1,4 +1,5 @@
 AUX braa-0.8-gentoo.diff 451 BLAKE2B 3ec683de9a698fac9d3e675cadabf8de65a1659f4bd8469ab75dfa5c643b27a7c09305781457ab0eeb40fa305e193d3530cb9a244e63b60c2ac1d0f3862de411 SHA512 cb3981542c50076beff544f68cf4596e62fe199d68497f0d1b03fd70b90344fec8f7bc00797cb40de699028a56b37708dd1bfc405e8d85a3977b1fcd0ed99b2a
 DIST braa-0.82.tar.gz 39927 BLAKE2B 411a106118b2b3e135542ca507ccd07e910f19b256a12336119c3a088eca16b9a8c715840b633461523fd05881a522b083029f3c498588f7c4c38f518165840d SHA512 8c88d288287a12c19c8d49606c8d2b70531b7f2be1aa3c4ccc6b01739aead751c03c56dc3f1a346b3dd20730a8bd0d30e33167a5f7c676f629348195762e23d4
+EBUILD braa-0.82-r1.ebuild 514 BLAKE2B a789825f6c723bdd95239257a3d4c06d5b7987bae16b2b1a731ed6aef242d7d5e2c62b47179648da029a5221d0c75a5606a34993b46051d147ae0d0cb7a908d0 SHA512 5d471285f3ddfdae99f192d7d9d0631dde8a1fcfbb2d444da5db555c11c2b4ffb23efd5954d57992270ad0e7519e9adc33c27e66fc8a0a922ac8a56bcc0d17c9
 EBUILD braa-0.82.ebuild 509 BLAKE2B 6232872afd4e5b63cbc9c7fd4d4594661e7d98a624492415dbdae5fba0d81933830c009247191b56791d9443e7ef126014d564cc4870f0f919683182429efce2 SHA512 c8c4d8d74dcb1108f930eaf394a216f63fcc7972298a5b82d9592e0bacfc547c1cf80c912d24bbf933aa7a4a99d49c5831b75b11501e010fdc0f5afefb61f6b6
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/net-analyzer/braa/braa-0.82-r1.ebuild b/net-analyzer/braa/braa-0.82-r1.ebuild
new file mode 100644
index 000000000000..c22f36d87117
--- /dev/null
+++ b/net-analyzer/braa/braa-0.82-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Quick and dirty mass SNMP scanner"
+HOMEPAGE="http://s-tech.elsat.net.pl/braa/"
+SRC_URI="http://s-tech.elsat.net.pl/braa/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8-gentoo.diff
+)
+
+src_prepare() {
+	default
+	sed -i braa.c -e 's|0.81|0.82|g' || die
+	tc-export CC
+}
+
+src_install() {
+	dobin braa
+	dodoc README
+}
diff --git a/net-analyzer/carl/Manifest b/net-analyzer/carl/Manifest
index 12478829b83c..26c2122a4bae 100644
--- a/net-analyzer/carl/Manifest
+++ b/net-analyzer/carl/Manifest
@@ -1,3 +1,3 @@
 DIST carl-0.9.tar.gz 11096 BLAKE2B 46298873f8fff62a965a7ec7a657522dd90d1a298814f537bb5b32582ea63d0bcb1d4988cd31e6918f16514c65dd3c6517e9079c3c78f6cb0a4bc6d8ece1614a SHA512 9876e30d171bf00c4e53c6e90c98181ac25aeda004bdb8a03060c45a99c55fa087062076ff3964a222d2981ed682ae7b8f4cbade13c69154198200d35e1a577e
-EBUILD carl-0.9-r2.ebuild 411 BLAKE2B d86e0ebabde59510a2f89143e5772f27245a314ae0fe7819b84d6d076d44898b9bb9684eba51ba5ecd78583ebbcd8aa05d0ea2fcf5e05cc3710a4b467a05e27e SHA512 0264e5f9ed859a1046cc944589a1bfa4722ca511f0ff2d172ce91ae7ac1c77496ed1b0c4ddb15c99169b1510e337771100e6601ab62089f0c495f9a96e08fd74
+EBUILD carl-0.9-r2.ebuild 402 BLAKE2B 85081031c5702ebc649634359c5d57877d417c7dea26c00bd5b44b1e7e5edfb5b9917f796a3104af508c50a778362c7d0c064cb43ee3cc5eff2ec9bceb035886 SHA512 eb96c04461232cd7ca0da23825a0feaa88a08c2150e3552681bf10e8ceffbb5ce097eb6228f82db97521a0daae2cf09c75d61c742d95e2937024ef136ab26b8c
 MISC metadata.xml 356 BLAKE2B bcdfa5dbbe63451ed8f27bfdcc926c60452ebf67fdcf486c487bb284b95c06f4baae460e7a6b607b698110175f2a21ad1fc702b3807ef53e2c6c40437bbdfb1b SHA512 e61b1bac117a325c4e96c7d8c594bd0de46379e573e8b89df72dfca572922807af29b2741c86be602d01856bed58bd369e72d65f0fef508d54001c00578d8637
diff --git a/net-analyzer/carl/carl-0.9-r2.ebuild b/net-analyzer/carl/carl-0.9-r2.ebuild
index a1c6382aa5a2..38f658a30c73 100644
--- a/net-analyzer/carl/carl-0.9-r2.ebuild
+++ b/net-analyzer/carl/carl-0.9-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy pypy3)
+PYTHON_COMPAT=( python{2_7,3_6} pypy3)
 
 inherit distutils-r1
 
diff --git a/net-analyzer/cbm/Manifest b/net-analyzer/cbm/Manifest
index e31794fd86e8..62ce3244d757 100644
--- a/net-analyzer/cbm/Manifest
+++ b/net-analyzer/cbm/Manifest
@@ -2,6 +2,9 @@ AUX cbm-0.1-gcc-4.3.patch 159 BLAKE2B ac9ae0a7a222e64e5c0284e9f3803ab97cef9a824f
 AUX cbm-0.1-gcc-4.7.patch 195 BLAKE2B 2c909deab45b4ecce26e243f0d65e838b67ee7fd7bd0ff4aabb689560a701550720c7f4cbbd047c9ca11984305f11cf3b8aecbbe7653c03437c3cfb59078564e SHA512 e1d66c6122163509ea247692362230323039f642f6f8cbc06f0023044223875fc9567a20c7dbdf5651313dc76a0033aa14118c5abe8aa8196ab90991c90d348d
 AUX cbm-0.1-headers-status-line.patch 1724 BLAKE2B 12a8fd6edfbe34eaacabf4e4093173b429a0307099dc56260d6a87a4c914719afcaf24dac2761ed30d3f3dff003edd0e15159b4df138a1d1c0b00d1ee3b705f2 SHA512 06a4614ece7d265b5604e4021671012d0ec8cece3f77025f9866c6c4193f85a5b7cbea740952dfd7d16cae6798708428fe5be4c06f5684baf9493c30effb867e
 AUX cbm-0.1-tinfo.patch 463 BLAKE2B e985b2f962247dbe2f230580149abccc7a1d8b7ed069791bf30780ca61aa881f4f58c98aed2aa851dd0f78ac5da2587ba316cccc60277d09ae700864812fbbb8 SHA512 51509006d183634a4322ace7de01fde57bbd0d18a991dfab43e7189227f88edc7201d47e3a38826a15ba67047357f39d7a1298788268bf2db6b27aa2a048d903
+AUX cbm-0.2-tinfo.patch 531 BLAKE2B 6edd4f9904142badb81f721a0c6f359e189bd544fae32f9084376922843dfa0e7061c37959ad2d8fe59bbd799bcce825ced26e5f7f387e24b620110b7f71804d SHA512 47aa578894550fe920752c3b1dae4f22bcc6fa240e11ecc20c423972a695bd8f374a1b7437048dfbb113e7152aaf959d21a81d0028e4d89ebfb1406c7e3a10cc
 DIST cbm-0.1.tar.gz 310247 BLAKE2B 08d2b7c79795217e6f6e2c72bbf1a4e5af096ddd9ed76c9a61093cd790d7ef2429d2db3d94102c334f1433803d4b91cb297f57185b666554ce84eee5c2295322 SHA512 24bf6a4d68fed253977b965d7e5b6aff4fb9db502c47b4a2b3b36f8c2963c9648b78ae607e9753fe4792a73ddbc29b86b3a1acc3c431a9355b11ff348566add4
+DIST cbm-0.2.tar.gz 16043 BLAKE2B a5c041ac33b4694c2933bee0d71786896ec30d0735b921f34cfb6a247179709afd9fa6d90f0602869976f334391e8138830f538b18a08a7396f4049e26029b24 SHA512 ca9dbbd73e707dca3b7bf10201840de28b2b3956ce3cb2fc76e1b530caf6ff883eb437f8be0df1efe3b5d8398c4949ea00de4ba48ed26b27afa21cf445d5d076
 EBUILD cbm-0.1-r1.ebuild 700 BLAKE2B 6eadd3da686a4eca79e4e727ac249f6d847da8720afb0529b22df613a450b0fc4ca498585a3156b7c4c1cf809dd9f77f5d11ca1e4b21daf4af4a8de8bc29121b SHA512 fc42b5a193f2e0ee6d2f172f172d5a6c3bbc6c02572785e1471fd8101e1e735480a31e8f06821e12dd5d1a7a8734e607920c6831b4bb93cdadab3d7e858f8e6a
+EBUILD cbm-0.2.ebuild 644 BLAKE2B 4d8d12be2e0f22df0671682acb74db9b0664b16fa69397c080c85e390d2288577d2b210d73f1f533dd1dd0bd0935600e7a086e071451985765931c65c4fc0143 SHA512 b7230fa1e1ceb8abbef8f2de5a77173c7b73cd2fad7205abdc6da649dc18c45230a76506b4167fc421d555e7b4c7fa7952069cb68bd5cfe85a70d8de1f5e6215
 MISC metadata.xml 387 BLAKE2B 0cb8910fe08af4b1b9a874dc196724cd4e7d7f65d3112ec24bacc6d338d2931afbda0755cafc89e2ce844893e1649675e34f37c0baa6d141faf45a7ca77f866b SHA512 8092aa19143ae23dec4bf31dafb786c6dbc40fce3fbe2bf144ccfaf82581bd9a44ac3bdbfa8d6d60ff6f9cbdbd29b2a77eb860385d3ea242d1e1c430eb8347c6
diff --git a/net-analyzer/cbm/cbm-0.2.ebuild b/net-analyzer/cbm/cbm-0.2.ebuild
new file mode 100644
index 000000000000..970db519d022
--- /dev/null
+++ b/net-analyzer/cbm/cbm-0.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Color Bandwidth Meter"
+HOMEPAGE="
+	http://www.isotton.com/software/unix/cbm/
+	https://github.com/resurrecting-open-source-projects/cbm
+"
+SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	sys-libs/ncurses
+"
+DEPEND="
+	${RDEPEND}
+	app-text/docbook-xml-dtd:4.4
+	app-text/xmlto
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2-tinfo.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/net-analyzer/cbm/files/cbm-0.2-tinfo.patch b/net-analyzer/cbm/files/cbm-0.2-tinfo.patch
new file mode 100644
index 000000000000..a719969eaaab
--- /dev/null
+++ b/net-analyzer/cbm/files/cbm-0.2-tinfo.patch
@@ -0,0 +1,21 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -37,6 +37,7 @@
+ AC_CANONICAL_HOST
+ 
+ # Checks for libraries.
++PKG_CHECK_MODULES(ncurses,ncurses)
+ 
+ # Checks for header files.
+ AC_CHECK_HEADER(curses.h,[],[ AC_MSG_ERROR(curses.h not found or too old.) ], [])
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -24,7 +24,7 @@
+ cbm_SOURCES = cbm.cpp \
+ 	      ErrnoError.hpp \
+ 	      statistics.cpp statistics.hpp
+-cbm_LDADD = -lncurses widgets/libwidgets.la
++cbm_LDADD = $(ncurses_LIBS) widgets/libwidgets.la
+ 
+ distclean-local:
+ 	-rm -f *~ \
diff --git a/net-analyzer/dnsmap/Manifest b/net-analyzer/dnsmap/Manifest
new file mode 100644
index 000000000000..04c2b6b519ce
--- /dev/null
+++ b/net-analyzer/dnsmap/Manifest
@@ -0,0 +1,3 @@
+DIST dnsmap-0.35.tar.gz 73584 BLAKE2B 15de8771f8add66d2598996961cae06670ebf9009d575ad3eaee6e7300163fbc84abf6e9082791de155a9daf5581cf2daf568a7a85a4a55adbf0c81e92639e94 SHA512 9a1bc25500dde22f2c641cd41a83e634dffda06fdfd62d439b9b8656f5e7624ab1d4736ed0d375acc24fb3f12091f7f75190fd97c4b7fa3c237baa0ade871ca1
+EBUILD dnsmap-0.35.ebuild 568 BLAKE2B 3cafa93ee6613ce9329be05b62bfc6d9c58b35e69bde7357863d7ce3786370791ea7f0d524e6aa9faaeca40e1666b717ba4f4d199ecaea3c638709ddc7fda897 SHA512 dd344f94e67545d0e278865ca438edbfdc59113e5ff631c97c8eed7b0bfa5db2a00acf01d4afe2352add6128755bc64723ca034a74989bdba5dd36ac2f565636
+MISC metadata.xml 214 BLAKE2B 4446a18615c9ae6446000d6d87c369372cf676ce6d21f6ac5e11932fc97833478c6d42f7469ac5a0cccb3aecbda03850590c3fed13b1395c9272d366e13e08c1 SHA512 7a44c566c4d93dfca459487b5ccf51b49f02d11f56e766442953c12db49cf45fdf6aa12089e0a52b6942ea7adadcc90fc7814fc02f6ada5a0e91831e1a44149e
diff --git a/net-analyzer/dnsmap/dnsmap-0.35.ebuild b/net-analyzer/dnsmap/dnsmap-0.35.ebuild
new file mode 100644
index 000000000000..d6cb5787b332
--- /dev/null
+++ b/net-analyzer/dnsmap/dnsmap-0.35.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Scan for subdomains using bruteforcing techniques"
+HOMEPAGE="https://github.com/resurrecting-open-source-projects/dnsmap"
+SRC_URI="https://github.com/resurrecting-open-source-projects/dnsmap/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=(
+	CONTRIBUTING.md
+	ChangeLog
+	NEWS
+	README.md
+	TODO
+	doc/CREDITS.old
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+}
diff --git a/net-analyzer/dnsmap/metadata.xml b/net-analyzer/dnsmap/metadata.xml
new file mode 100644
index 000000000000..825589988b40
--- /dev/null
+++ b/net-analyzer/dnsmap/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>netmon@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/egressor/Manifest b/net-analyzer/egressor/Manifest
index 3ac198451d57..256984e5c069 100644
--- a/net-analyzer/egressor/Manifest
+++ b/net-analyzer/egressor/Manifest
@@ -1,5 +1,5 @@
 AUX 1.0-flags.patch 578 BLAKE2B 18df2e1acd88224555288e23f1c21dbab799b92f442a66b5f879668a10a93c42854573bba136718586a4bc5d7cdcc8fc6ba53b34a2117bb87016c9e5d1b57f51 SHA512 aecc7970d9a9e877adf750e29813ad6a685370dc9ea72f34b86a5ddbafcf616db0636b4173e4ba445ac9c3d6a21e2aae26cce1889ba901ac9dea6af79243657a
 AUX 1.0-libnet-1.0.patch 250 BLAKE2B e7790e2d6a92517e2a3ffee68aa98b894a965458f065fb5854f4b7b018c759f444c2590cd227bc139816f891d5c731409f49cc68489f9f2258a62df131ba0a01 SHA512 eff978e5c4a9a99073b1280aa5369ecbb6100364332cb810bacb3bc4ddd316638ff6a8968923b51e4f72a79ddd994646d03000b3fa3f576ad8d898eea493e089
 DIST egressor_release1.0.tar.gz 28746 BLAKE2B 224ffd1fb56d9088a66367bbd88ecaab83c2316b2614a2b5211e03c4ff07683f8584c46d6ab7f0b26cbcb87a3321d0d3789a22cfee994aca3df8c488c9a297e5 SHA512 dfb1ee553ccfb92429fe68df06db031e5cbca41fe4fda36961ba8121d79de03a7dc36febc5a58561c3de9b1412cc90811f5ddc8b156aab8282b0dc3c14cd7aec
-EBUILD egressor-1.0-r2.ebuild 779 BLAKE2B c2db6f0ec4d45a357f2045de8dd020f1068b32e12406cba668a9acf0e62b85cc10a1998261854e43e00e7944b3327b2bf585acd0123619ff3eb8f00b7c6a9493 SHA512 39c24de70760c687789ba9ef67b1aa362c3e602a3df6b9b8afcda7c4b78637d88752292e92bff8fdf590242b70c7c2a19d532f6faa3f88f7a53a9e894587df41
+EBUILD egressor-1.0-r2.ebuild 820 BLAKE2B 2ea6484c21001067f208613ac450917467f50afc3e51456d0d3357ece39da13981941868e5c7d74822dc32923a7016090eda9a709bcf6cae89ec3340f453db4c SHA512 84a307b37d11375d38ebbdf0bdac44bb9c5fad50fccfc517e2b7806ab7ebc71b9820692e0200e5c4a937397d49747e9a744556e3c5f0328d57a0a15507c16106
 MISC metadata.xml 350 BLAKE2B f171bc67b9f70b197d8e9ca8b9e37840ea80f0702cbbbb748b8254efd7e18ceccb1a642214bab5db8d8f666f171b6fd26a02e0a86bacfef45963c3eaaf3fefa3 SHA512 fee212446254d141db6165f5e1da517976f7bda7e972e8a4984002bc164a02faddf242da8cfaf7b2c9d31e22c1387e71b3779fd572c544abd8b297365f1f2162
diff --git a/net-analyzer/egressor/egressor-1.0-r2.ebuild b/net-analyzer/egressor/egressor-1.0-r2.ebuild
index bac30f82bf2b..6d004f56b27b 100644
--- a/net-analyzer/egressor/egressor-1.0-r2.ebuild
+++ b/net-analyzer/egressor/egressor-1.0-r2.ebuild
@@ -6,7 +6,7 @@ inherit eutils toolchain-funcs
 
 DESCRIPTION="tool for checking router configuration"
 HOMEPAGE="http://packetfactory.openwall.net/projects/egressor/"
-SRC_URI="${HOMEPAGE}${PN}_release${PV}.tar.gz"
+SRC_URI="http://packetfactory.openwall.net/projects/egressor/${PN}_release${PV}.tar.gz"
 
 LICENSE="egressor"
 SLOT="0"
diff --git a/net-analyzer/ethloop/Manifest b/net-analyzer/ethloop/Manifest
index 8ec0e122562c..f206449cf7ae 100644
--- a/net-analyzer/ethloop/Manifest
+++ b/net-analyzer/ethloop/Manifest
@@ -1,4 +1,6 @@
-AUX ethloop-10-gcc45.patch 784 BLAKE2B 279f17c9cdf0e8025ad4f5868431e4ec008bd103da968878d836b23b1e3b5f96a46ffd78156b1ba4b09a84fcd2b9365faae13dc6b16b966ff9df9434ee8443a6 SHA512 213978c89fca49f82c47322e91a4ba6a72b92b711b9386de9833b7330e6fa9fb5668d658968669c1eeeddae96a74c32a086ad630410b9c3b8e153a19e720c036
+AUX ethloop-10-gcc45.patch 712 BLAKE2B b7a58c136663860120467fef7e752b957383d8e5e84325bfda20873581673937e669044a67a61b02080570397e5599e207162e430c910e319d4f32db30a9b412 SHA512 c10c7b723698dc6426478b7e9d861a7a88c887a6df3033c8080f51149882925952ff6cf0d0c7ca1d35dcda2c43cb278d8c4475a37d8be3a5a653c974b48bb7b2
+AUX ethloop-10-misc.patch 1760 BLAKE2B f3e22dc20e87bae4d9deab283581f12330ab4535394c1fb1fb787dc7d550a63da64ab936c3b89f06aa3dc218357eaa7ce8a41de9006b62a31c7026f2c75cf51f SHA512 0bb1bacf5103e9b3715c0242844e90007ea68715dbf51abc12c14c845277f6520023c59f4e014cb955552d7dc7854ebe46524e6f5dc2faf47cb145a844fe5ba1
 DIST ethloop10.tgz 3912 BLAKE2B 4cd0ad93693afb2302627b9fcbefa94eefec3d29c55e583c5126aed9cfb20aa7a2d68834fa138debaf767972e7e898245d7297567b322953e1df03b3817a5609 SHA512 82ac0114d0d539f5c057101e1e1f0e2eac32e0bd482bd62e6305f7c4863d0776dcff7bc85167dbcfb136d0b430c9008241c2c0250713beb2703cb052b9b71e63
 EBUILD ethloop-10-r3.ebuild 592 BLAKE2B 7ed809c6d8b0ad043e25edd6d4299a756c5f2b3194f5b3cc806867dcf697656537bb8b0fbcb24dcad0384d0e115c5a17e9b8e9f74fb281718055b7db4818c7c9 SHA512 5e5761dc8ccb7bbe860372ec80ce9c5eb94775a9f4ea62ad7395276e5878d21ccb85b1c990d9a7d1baf4d2e4389532a81e9e0f5ec7204d0264ab73229fef8e34
+EBUILD ethloop-10-r4.ebuild 566 BLAKE2B 910631366a94edb0c6ced18743538cbc6b0db4d87421df030097d85fd535d6295adc92201b3a4f92758425046c195fecf676d6ccfe48edfaf9c2bd915e2453e6 SHA512 ff4c6306d6f61a5c457e343a41035f53e785c75dfba7d9d2378f664d84e72ff8543f6ad4b543a73841192f7e5e86300cbab529b1ff541491a6c119c72491e004
 MISC metadata.xml 361 BLAKE2B ba68d26d43079aade6030f489fbe6d88a68c289f4bebead36dc0ffc934d675d7b08c4caff6474a37f27f3eb20f71b1c45abe029b72b310b7037bbd95454b1365 SHA512 a4572b46f20688c9d75c5aa555bf051f3416b8992e0c2358f4594be215571f356575441d4e45b2785af0c6c5c5c2d8862f2fd48202cc528ccda3a9e8ba69c214
diff --git a/net-analyzer/ethloop/ethloop-10-r4.ebuild b/net-analyzer/ethloop/ethloop-10-r4.ebuild
new file mode 100644
index 000000000000..4067bea8c944
--- /dev/null
+++ b/net-analyzer/ethloop/ethloop-10-r4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Local simulator for testing Linux QoS disciplines"
+HOMEPAGE="http://luxik.cdi.cz/~devik/qos/ethloop/"
+SRC_URI="http://luxik.cdi.cz/~devik/qos/${PN}/${PN}${PV}.tgz"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="mirror bindist"
+
+S=${WORKDIR}/${PN}
+PATCHES=(
+	"${FILESDIR}"/${P}-misc.patch
+)
+
+src_compile() {
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dosbin ethloop
+}
diff --git a/net-analyzer/ethloop/files/ethloop-10-gcc45.patch b/net-analyzer/ethloop/files/ethloop-10-gcc45.patch
index 75b951102245..bf905cd44b2c 100644
--- a/net-analyzer/ethloop/files/ethloop-10-gcc45.patch
+++ b/net-analyzer/ethloop/files/ethloop-10-gcc45.patch
@@ -1,7 +1,7 @@
 Fix recv call (bug #336755), add some more includes.
 
---- a/ethloop.c	2002-05-03 15:13:20.000000000 +0200
-+++ b/ethloop.c	2010-12-27 18:21:24.000000000 +0100
+--- a/ethloop.c
++++ b/ethloop.c
 @@ -1,5 +1,7 @@
  /* vim: cin sw=4 ts=4
  */
diff --git a/net-analyzer/ethloop/files/ethloop-10-misc.patch b/net-analyzer/ethloop/files/ethloop-10-misc.patch
new file mode 100644
index 000000000000..a866386a7006
--- /dev/null
+++ b/net-analyzer/ethloop/files/ethloop-10-misc.patch
@@ -0,0 +1,65 @@
+--- a/ethloop.c
++++ b/ethloop.c
+@@ -1,5 +1,7 @@
+ /* vim: cin sw=4 ts=4
+ */
++#include <arpa/inet.h> /* htons() */
++#include <sys/types.h> /* recv() */
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+ #include <sys/poll.h>
+@@ -13,6 +15,7 @@
+ #include <stdlib.h>
+ #include <sys/time.h>
+ #include <signal.h>
++#include <string.h>
+ 
+ int sock;
+ 
+@@ -133,11 +136,11 @@
+ int recv_raw(int tmo)
+ {
+ 	struct pollfd pf = {sock,POLLIN,0};
+-	int r; unsigned short proto;
++	ssize_t r;
+ 	if(poll(&pf,1,tmo) <= 0) return 0;
+-	r = recv(sock,&buf,1550,0);
++	r = recv(sock,&buf,sizeof(buf),0);
+ 	if (r <= 0) {
+-		printf("error recv (%d)\n",r);
++		printf("error recv (%ld)\n",r);
+ 		return 0;
+ 	}
+ 	if (ntohs(buf.proto) != ETH_P_CUST) {
+@@ -239,10 +242,10 @@
+ 	}
+ }
+ 	
+-main(int c,char *av[])
++int main(int c,char *av[])
+ {
+-	unsigned long av_k1=0,av_k2=0,t_k1=0,t_k2=0;
+-	unsigned long av_k3=0,av_k4=0,t_k3=0,t_k4=0;
++	unsigned long av_k1=0,av_k2=0;
++	unsigned long av_k3=0,av_k4=0;
+ 	int x,tmo,flow,diff,lcheck = 0,lwrite = 0,i,n; 
+ 	struct flowtab *fp;
+ 	sock = socket(PF_PACKET,SOCK_RAW,htons(ETH_P_ALL));
+@@ -309,7 +312,7 @@
+ 		/* write stats every .5 second */
+ 		if (us - ALIGN(lwrite,LOGTIME) < LOGTIME) continue;
+ 		lwrite = us;
+-		fprintf(stderr,"store %d at %d ms\n",slog_cnt,us/1000);
++		fprintf(stderr,"store %d at %ld ms\n",slog_cnt,us/1000);
+ 		for (fp = ftab,i=0;i<FLOWS;fp++,i++) {
+ 			stp = slog + slog_cnt;
+ 			stp->av_delay[i] = fp->av_delay/EWMAC; 
+@@ -338,7 +341,7 @@
+ 		printf("%d.%d",(i+1)/2,(i&1)?0:5);
+ 		for (flow = 0; flow <= maxflow; flow++) {
+ 			fp = ftab + flow;
+-			printf(" %d %d %d %d",stp->av_wrate[flow],
++			printf(" %ld %ld %ld %ld",stp->av_wrate[flow],
+ 					stp->av_rate[flow], stp->av_delay[flow]/1000, 
+ 					stp->av_jitter[flow]);
+ 		}
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index 2ca958418cce..80f82c1619c8 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -1,5 +1,9 @@
 DIST fail2ban-0.10.4.tar.gz 493104 BLAKE2B 3a58ab114cf25172c77b229ce53bf6dd009d4fb8c700142480ba0212072d8820126bfabf5dd417835bdac5f5b65d599c6dde859d8c57267e90cfb569dc4a2073 SHA512 ee53f2e8dc3cda4f588c60da5227d3d71550496ddfdf5bdbffced25bafd442b8e2352a9ad9f27bf76489903b5b779cdb9614963342de907c1036ae9268b8f35f
-EBUILD fail2ban-0.10.4-r2.ebuild 3316 BLAKE2B 822c4206e75626af5e6b8010a0148f95e1139c7c4d3e27941d8d6ad90ca5407bee0eb8238f77873a8f167cd236169735db4611f2c30e6dd6192967a294bacd88 SHA512 5d306daff6ed10bdaf6e81b70aea83acd8d5e310e2d40466eb40f5a52e9c7eb6ac4cd363a53ac685f600dfe17eadba8ae7a9b6e09f192c4261bc943bfffdcfff
-EBUILD fail2ban-0.10.4.ebuild 3272 BLAKE2B 717b33037ae160dbff07f6b13cefd50563ea0893b342a141401f64e8db6a02f152766e55025472859fe00afedd61c792a707c9b4a95290a83ec756234c551631 SHA512 f506a466ededa0fc5a4c01a45c8addd5364a0ca0385f6fbab6a264583563468c245befd7d1f3846131cf564e8049a538fa5bac58499487b44bde9df3bbd6ea31
-EBUILD fail2ban-99999999.ebuild 3087 BLAKE2B 6e6ab336757845e7d7e4da03c705f9b6b6877b19f007d5aa6f4a3faac0b9d6b10cfb51101334bd376e51f8280797245757696c623a7463873cd90cf456fde79a SHA512 d2441165011a25ac3616b5cf7e10ef53cdea1993a020c4af6ec5466ec86d48bd4065d86d184a9d56d5eab7ac5b952e2db1df2aa6e170209cae09d7acff5a53e4
+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 3209 BLAKE2B 7b97cd973514c6ced851e5b588fcc86799a8c183bc421b970992dc389f64dbe2b6293bf87a1d6c270e63615238b858752bd6137f26aefa0954229729fbf291c0 SHA512 5d060e1bd805203e9327c3105e0ee0fbc306daa3efcd4e942478e46e2a6f07da294e1695da1b035d4b9ea3495dca87a76a85ed0fa7ce58ead81a6cea9b91ac35
+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
 MISC metadata.xml 372 BLAKE2B 7fca866187d9a128e6fb6787a4099d7a6442e0e51e558786773b91c3e2f06e67167d76f9bc96be0fe1baa1c44fc3f0e9e2105a327a10cb2720b3e3f9e4303a66 SHA512 4d5710e2fb4a7c353ca6bd3203bceef57d4d004367993dc1044800ee8713a3f4697fe8ba3472a73ecd015503656dfb7cd68d674c99188ce5702769cfeaf06b25
diff --git a/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild
index ac3d06186227..85730ff0b684 100644
--- a/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1 systemd
@@ -25,7 +25,7 @@ RDEPEND="
 		sys-apps/systemd[python(-),${PYTHON_USEDEP}]
 	)' 'python*' ) )
 "
-REQUIRED_USE="systemd? ( !python_single_target_pypy )"
+
 RESTRICT="test"
 DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
 
diff --git a/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild
index 613c33272c07..8cac6a35ee6e 100644
--- a/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1 eutils systemd vcs-snapshot
@@ -29,7 +29,7 @@ RDEPEND="
 		sys-apps/systemd[python(-),${PYTHON_USEDEP}]
 	)' 'python*' ) )
 "
-REQUIRED_USE="systemd? ( !python_single_target_pypy )"
+
 RESTRICT="test"
 DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
 
diff --git a/net-analyzer/fail2ban/fail2ban-0.10.5-r1.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.5-r1.ebuild
new file mode 100644
index 000000000000..56a0f3046d23
--- /dev/null
+++ b/net-analyzer/fail2ban/fail2ban-0.10.5-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_6} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit bash-completion-r1 distutils-r1 systemd
+
+DESCRIPTION="scans log files and bans IPs that show malicious signs"
+HOMEPAGE="https://www.fail2ban.org/"
+SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="selinux systemd"
+
+RDEPEND="
+	virtual/logger
+	virtual/mta
+	selinux? ( sec-policy/selinux-fail2ban )
+	systemd? ( $(python_gen_cond_dep '|| (
+		dev-python/python-systemd[${PYTHON_USEDEP}]
+		sys-apps/systemd[python(-),${PYTHON_USEDEP}]
+	)' 'python*' ) )
+"
+
+RESTRICT="test"
+DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
+
+src_unpack() {
+	default
+	mv ${PN}-${PN}-* ${P} || die
+}
+
+python_prepare_all() {
+	default
+
+	# Replace /var/run with /run, but not in the top source directory
+	find . -mindepth 2 -type f -exec \
+		sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die
+
+	sed -i -e 's|runscript|openrc-run|g' files/gentoo-initd || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if python_is_python3; then
+		./fail2ban-2to3 || die
+	fi
+	distutils-r1_python_compile
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	rm -rf "${D}"/usr/share/doc/${PN} "${D}"/run || die
+
+	# not FILESDIR
+	newconfd files/gentoo-confd ${PN}
+	newinitd files/gentoo-initd ${PN}
+	sed -e "s:@BINDIR@:${EPREFIX}/usr/bin:g" files/${PN}.service.in > "${T}/${PN}.service" || die
+	systemd_dounit "${T}/${PN}.service"
+	systemd_dotmpfilesd files/${PN}-tmpfiles.conf
+	doman man/*.{1,5}
+
+	# Use INSTALL_MASK if you do not want to touch /etc/logrotate.d.
+	# See http://thread.gmane.org/gmane.linux.gentoo.devel/35675
+	insinto /etc/logrotate.d
+	newins files/${PN}-logrotate ${PN}
+
+	keepdir /var/lib/${PN}
+
+	newbashcomp files/bash-completion ${PN}-client
+	bashcomp_alias ${PN}-client ${PN}-server ${PN}-regex
+}
+
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.7"
+	previous_less_than_0_7=$?
+}
+
+pkg_postinst() {
+	if [[ $previous_less_than_0_7 = 0 ]] ; then
+		elog
+		elog "Configuration files are now in /etc/fail2ban/"
+		elog "You probably have to manually update your configuration"
+		elog "files before restarting Fail2ban!"
+		elog
+		elog "Fail2ban is not installed under /usr/lib anymore. The"
+		elog "new location is under /usr/share."
+		elog
+		elog "You are upgrading from version 0.6.x, please see:"
+		elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8"
+	fi
+
+	if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin; then
+		elog "For most jail.conf configurations, it is recommended you install either"
+		elog "dev-python/pyinotify or app-admin/gamin (in order of preference)"
+		elog "to control how log file modifications are detected"
+	fi
+
+	if ! has_version dev-lang/python[sqlite]; then
+		elog "If you want to use ${PN}'s persistent database, then reinstall"
+		elog "dev-lang/python with USE=sqlite. If you do not use the"
+		elog "persistent database feature, then you should set"
+		elog "dbfile = :memory: in fail2ban.conf accordingly."
+	fi
+
+	if has_version sys-apps/systemd[-python]; then
+		elog "If you want to track logins through sys-apps/systemd's"
+		elog "journal backend, then reinstall sys-apps/systemd with USE=python"
+	fi
+}
diff --git a/net-analyzer/fail2ban/fail2ban-0.11.1-r1.ebuild b/net-analyzer/fail2ban/fail2ban-0.11.1-r1.ebuild
new file mode 100644
index 000000000000..8481a7ca53ff
--- /dev/null
+++ b/net-analyzer/fail2ban/fail2ban-0.11.1-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_6} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit bash-completion-r1 distutils-r1 systemd
+
+DESCRIPTION="scans log files and bans IPs that show malicious signs"
+HOMEPAGE="https://www.fail2ban.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="selinux systemd"
+
+RDEPEND="
+	virtual/logger
+	virtual/mta
+	selinux? ( sec-policy/selinux-fail2ban )
+	systemd? ( $(python_gen_cond_dep '|| (
+		dev-python/python-systemd[${PYTHON_USEDEP}]
+		sys-apps/systemd[python(-),${PYTHON_USEDEP}]
+	)' 'python*' ) )
+"
+
+RESTRICT="test"
+DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
+
+python_prepare_all() {
+	default
+
+	# Replace /var/run with /run, but not in the top source directory
+	find . -mindepth 2 -type f -exec \
+		sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die
+
+	sed -i -e 's|runscript|openrc-run|g' files/gentoo-initd || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if python_is_python3; then
+		./fail2ban-2to3 || die
+	fi
+	distutils-r1_python_compile
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	rm -rf "${D}"/usr/share/doc/${PN} "${D}"/run || die
+
+	# not FILESDIR
+	newconfd files/gentoo-confd ${PN}
+	newinitd files/gentoo-initd ${PN}
+	sed -e "s:@BINDIR@:${EPREFIX}/usr/bin:g" files/${PN}.service.in > "${T}/${PN}.service" || die
+	systemd_dounit "${T}/${PN}.service"
+	systemd_dotmpfilesd files/${PN}-tmpfiles.conf
+	doman man/*.{1,5}
+
+	# Use INSTALL_MASK if you do not want to touch /etc/logrotate.d.
+	# See http://thread.gmane.org/gmane.linux.gentoo.devel/35675
+	insinto /etc/logrotate.d
+	newins files/${PN}-logrotate ${PN}
+
+	keepdir /var/lib/${PN}
+
+	newbashcomp files/bash-completion ${PN}-client
+	bashcomp_alias ${PN}-client ${PN}-server ${PN}-regex
+}
+
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.7"
+	previous_less_than_0_7=$?
+}
+
+pkg_postinst() {
+	if [[ $previous_less_than_0_7 = 0 ]] ; then
+		elog
+		elog "Configuration files are now in /etc/fail2ban/"
+		elog "You probably have to manually update your configuration"
+		elog "files before restarting Fail2ban!"
+		elog
+		elog "Fail2ban is not installed under /usr/lib anymore. The"
+		elog "new location is under /usr/share."
+		elog
+		elog "You are upgrading from version 0.6.x, please see:"
+		elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8"
+	fi
+
+	if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin; then
+		elog "For most jail.conf configurations, it is recommended you install either"
+		elog "dev-python/pyinotify or app-admin/gamin (in order of preference)"
+		elog "to control how log file modifications are detected"
+	fi
+
+	if ! has_version dev-lang/python[sqlite]; then
+		elog "If you want to use ${PN}'s persistent database, then reinstall"
+		elog "dev-lang/python with USE=sqlite. If you do not use the"
+		elog "persistent database feature, then you should set"
+		elog "dbfile = :memory: in fail2ban.conf accordingly."
+	fi
+
+	if has_version sys-apps/systemd[-python]; then
+		elog "If you want to track logins through sys-apps/systemd's"
+		elog "journal backend, then reinstall sys-apps/systemd with USE=python"
+	fi
+}
diff --git a/net-analyzer/fail2ban/fail2ban-99999999.ebuild b/net-analyzer/fail2ban/fail2ban-99999999.ebuild
index d4e1f1886dc8..1618b1f20e24 100644
--- a/net-analyzer/fail2ban/fail2ban-99999999.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-99999999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 DISTUTILS_SINGLE_IMPL=1
 
-inherit distutils-r1 git-r3 systemd
+inherit bash-completion-r1 distutils-r1 git-r3 systemd
 
 DESCRIPTION="scans log files and bans IPs that show malicious signs"
 HOMEPAGE="https://www.fail2ban.org/"
@@ -25,7 +25,7 @@ RDEPEND="
 		sys-apps/systemd[python(-),${PYTHON_USEDEP}]
 	)' 'python*' ) )
 "
-REQUIRED_USE="systemd? ( !python_single_target_pypy )"
+
 RESTRICT="test"
 DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
 
@@ -41,6 +41,13 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
+python_compile() {
+	if python_is_python3; then
+		./fail2ban-2to3 || die
+	fi
+	distutils-r1_python_compile
+}
+
 python_install_all() {
 	distutils-r1_python_install_all
 
@@ -49,8 +56,8 @@ python_install_all() {
 	# not FILESDIR
 	newconfd files/gentoo-confd ${PN}
 	newinitd files/gentoo-initd ${PN}
-	sed -e "s:@BINDIR@:${EPREFIX}/usr/bin:g" files/${PN}.service.in > "${T}"/${PN}.service || die
-	systemd_dounit "${T}"/${PN}.service
+	sed -e "s:@BINDIR@:${EPREFIX}/usr/bin:g" files/${PN}.service.in > "${T}/${PN}.service" || die
+	systemd_dounit "${T}/${PN}.service"
 	systemd_dotmpfilesd files/${PN}-tmpfiles.conf
 	doman man/*.{1,5}
 
@@ -60,6 +67,9 @@ python_install_all() {
 	newins files/${PN}-logrotate ${PN}
 
 	keepdir /var/lib/${PN}
+
+	newbashcomp files/bash-completion ${PN}-client
+	bashcomp_alias ${PN}-client ${PN}-server ${PN}-regex
 }
 
 pkg_preinst() {
diff --git a/net-analyzer/firewalk/Manifest b/net-analyzer/firewalk/Manifest
index d272fcb072e7..c6b77607b0b4 100644
--- a/net-analyzer/firewalk/Manifest
+++ b/net-analyzer/firewalk/Manifest
@@ -1,4 +1,6 @@
 AUX firewalk-5.0-gcc3.4.diff 336 BLAKE2B 0ac2e06b910df060f25b892ea782bbb90c94d04c56cf02b297597717b5804a956667ca655b614b291747a6b4988b03d185a1a28e218930e81a4e2ba41b459a59 SHA512 7e6868951f4de1be0572ce1328fb8dd0d787cbd21198cdd84233db80aec40ad17d2748ff2afd98986fc4687357e0c7c411b80c0557aabcb73369ff1d1495cb5c
+AUX firewalk-5.0-usage.diff 489 BLAKE2B b1607306ee554ad0f069d2a2c478bcfc86561e481ad40319088405bba2a223012f0b6b95cda15294885ed16de0a8892b8d22d3a8a86528998f0f784002b8ae82 SHA512 46fd81b4363ff09de7c1d13983c85239a9c7fc9d3aa139d2c0f600bc4235d53475e3f737e41cc56181b876ab9d70cc56cba2b872a619449c2ce60e0af1398b6a
 DIST firewalk-5.0.tgz 80446 BLAKE2B 22580800fb21347fda6ff6290c0fd2f177e266778c2d6ce1087839b5484dfcf8e2ffbb415d90012d71e6d345ba4c95f888fecc902adaaa2903124605c1fcf427 SHA512 919aa6e464dac72a02f8967ccf7109de7d0b3a574f0a396bcf69bacc988ab8e13e8e25932d749eadc898cae2546f8f81014d53ef51429e6c784a16d40da90ff2
 EBUILD firewalk-5.0-r1.ebuild 588 BLAKE2B cd376b361b1339eae396fa450c6ff041481fb5f0550fcd9486a0f70eae6fd24140d504e2bb54b4c35846cf2f161fad3ccb86a87e8f08a7f94dbbb53e37922f87 SHA512 c8d5152dab5ca3b1f28f3314eb32dba2cd6e529e2bda0a4dfd33442b6a052579ef4590487d3a4d9e60c57dd5e3f8f733fec655142a835963cdc7994049614c46
+EBUILD firewalk-5.0-r2.ebuild 586 BLAKE2B 475f1b6c69a00d51ebb4d8dfde3621fc618f255d12c89f9a9c2629c6aaf287ac9d7964d3c9dce71cecd7d4f1b2f952098af906464e8100a3729606c9f4f104c5 SHA512 a90c91e1fe6f9e205bb3c0c48ff8f15636c33b065dc7bfac6b461483388946cff57749145ea4271e41255e2fb311ab84456ec7351b38351ca2e6f969927a70ff
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/firewalk/files/firewalk-5.0-usage.diff b/net-analyzer/firewalk/files/firewalk-5.0-usage.diff
new file mode 100644
index 000000000000..dac54f558135
--- /dev/null
+++ b/net-analyzer/firewalk/files/firewalk-5.0-usage.diff
@@ -0,0 +1,22 @@
+--- a/include/firewalk.h
++++ b/include/firewalk.h
+@@ -280,7 +280,7 @@
+ /* dump usage */
+ void
+ usage(
+-    u_char *                        /* argv[0] */
++    char *                        /* argv[0] */
+     );
+ 
+ #endif /* _FIREWALK_H */
+--- a/src/main.c
++++ b/src/main.c
+@@ -171,7 +171,7 @@
+ }
+ 
+ void
+-usage(u_char *argv0)
++usage(char *argv0)
+ {
+     fprintf(stderr, "Usage : %s [options] target_gateway metric\n"
+         "\t\t   [-d %d - %d] destination port to use (ramping phase)\n"
diff --git a/net-analyzer/firewalk/firewalk-5.0-r2.ebuild b/net-analyzer/firewalk/firewalk-5.0-r2.ebuild
new file mode 100644
index 000000000000..40b2b60d3a86
--- /dev/null
+++ b/net-analyzer/firewalk/firewalk-5.0-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A tool for determining a firewall's rule set"
+HOMEPAGE="http://packetfactory.openwall.net/projects/firewalk/"
+SRC_URI="mirror://gentoo/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="
+	dev-libs/libdnet
+	net-libs/libnet:1.1
+	net-libs/libpcap
+"
+RDEPEND="
+	${DEPEND}
+"
+S=${WORKDIR}/${PN^}
+DOCS=( README TODO BUGS )
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc3.4.diff
+	"${FILESDIR}"/${P}-usage.diff
+)
+
+src_install() {
+	default
+	doman man/firewalk.8
+}
diff --git a/net-analyzer/flent/Manifest b/net-analyzer/flent/Manifest
index 6f20f0cd2592..08bf49f9feb6 100644
--- a/net-analyzer/flent/Manifest
+++ b/net-analyzer/flent/Manifest
@@ -1,3 +1,3 @@
 DIST flent-1.0.1.tar.gz 2285619 BLAKE2B d5ab68144c8520e8077eddd529beb248654d59e05e6b5c90823bae61a86b0dffae959c2089be03b96731e7575eabcfcae2c7b738e9a8a77520a615c48801549a SHA512 868b83a52805cfdb0dc49379aea25e07135a949cea0e6c2388b026099723c20aa7b0146e19110786e763c7f22e1663c42a8bc21bdae2199d00ac85438a3fdf74
-EBUILD flent-1.0.1-r1.ebuild 623 BLAKE2B 3e5d9df5e5d53fa2dc9b58a716a27b575334682ee94bf4c6bc8b2b7ddfca314ab2491d258ea49ba39dc0a5fc81e74bb0aa1234101e8f770479aa8ab82c5d27a8 SHA512 0e1e6fdb37171d8322b5e9bdedd18151b85431d2513b9356a744da016f380aa1714c53a4293ca2548e2958e3dbfe22efecb908b9f0100927b50b0b1bc7e21580
+EBUILD flent-1.0.1-r1.ebuild 617 BLAKE2B b235dfcab6dec728c4a0649f01c43fe35c5a144705e51cb13cfe2c93ff2bb355ba46600ae3f911a5ad038a5e843abb9304ad2bef1317c9642aac5bd1c39a5b87 SHA512 a188a963edd9a0ed5a27c891e967f15d3b9c722c303eb684129736e4a0f1a67e9a835a3997d0ca3248a1e607c3754fbfe70ddd83ed6e4ce1faf5a8aae6729d45
 MISC metadata.xml 391 BLAKE2B 85925178db6e1ae966b020139760580a899541dba0a5160dd0a40d99a13838ff9d4884e70ae5f594f34a311ecc7a3eae00cf9d6027f538b58ef6aca3f2e6b43d SHA512 f659fc94acbe2d182b842fe2ef9a5a6f2cdbf43fc229e200586ee3a3d0a89f49eeddede26efc370b2a7710a739b50d8d83f219248628581da795b9e80a25baf7
diff --git a/net-analyzer/flent/flent-1.0.1-r1.ebuild b/net-analyzer/flent/flent-1.0.1-r1.ebuild
index 5d15a256f66d..81ba7b9749a6 100644
--- a/net-analyzer/flent/flent-1.0.1-r1.ebuild
+++ b/net-analyzer/flent/flent-1.0.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python{3_5,3_6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/net-analyzer/fwlogwatch/Manifest b/net-analyzer/fwlogwatch/Manifest
index db58278e1334..2a2ab2479f7c 100644
--- a/net-analyzer/fwlogwatch/Manifest
+++ b/net-analyzer/fwlogwatch/Manifest
@@ -1,5 +1,5 @@
 DIST fwlogwatch-1.4.tar.bz2 92652 BLAKE2B 94c5ecd6e17c3ce07ffaa33f738109162913253b837bcc4c4fc79068edb610c046b3a178db5481c3e145482686f3f837ecd2fc579700b4a5a68bbaae47f9e537 SHA512 0a67c0ae8b096fdf7a06e279a11b0bc71f2d514790c1669f60606b17a7f3f3ec97dedc2005438ce0ec82efcd66a822b62dbb36603f4b02e010f469fb885b87e6
 DIST fwlogwatch-1.5.tar.bz2 94451 BLAKE2B c0456931dc425df4ec190f1c8bcba21e0784009dae66869a5f5c0371b68d0bdb1bf57c788468f7c9fd32abf8b676a4029bcde7d348c37e4b7f5771bc48f04297 SHA512 d4890596859929ddc6adfd7f9e735e0c414bad40eff6732120a522a8bd4fb8d1442c7d1026f0f3c6ac5c4d51b76a2bac486d04f0fbceae67395c585098afef85
-EBUILD fwlogwatch-1.4.ebuild 1597 BLAKE2B 5093188394b88636cf028cbb9a127f6f63489ff43ea358b47fafbfee0e025ede085b4686849bcc7e48a78e8e936c2832476ecb252de518f4cab20fc9d435aec2 SHA512 650be48814c7f7602431a95a006252f4928107003c030d06fe5a1cefee5ab0ddd2b97af10b93e5a9742fceb40cb9ed0eca921e936e1028973c64406768dec333
-EBUILD fwlogwatch-1.5.ebuild 1743 BLAKE2B cc65d4bf2e7bb0605a88bbecd96c3babcd94e71ed4102f3f541cd72738cfb26057a589153e173a6d0320bb122b1a38609f0657dfef689861c60ad417829d6a9d SHA512 5ea5973fe13e703cff5defdd295e126b52efb7e7816f05b75aaaeb4d4ab77454b36700215d491d3b8d2a771fb510740fd44d1a36512cd521c9ddd26b9f74da30
+EBUILD fwlogwatch-1.4.ebuild 1623 BLAKE2B f6c6397661acf30b622b4524a3b482764f8fe6915b43760d32c10fe96ea9e36b196ee1a118217ad365a200e94630b0e24ca47e1be270c97b640f79bbad11998e SHA512 6ceee6e01da7cdc5bf3f1d36fe7a624935f070a43e79f3a9eb7bbf8c2bdf5071320c9f23b190191cc11eb6ab5fe75081bc97e2cd7dcdaae4685b327c633e8e98
+EBUILD fwlogwatch-1.5.ebuild 1769 BLAKE2B c2f6fdfae4ab022ef18f5ea74fe6d246e875c551f1eb31384d9955c81935c2dc3209b5837e099c373384a98850c60ca5d4304920641029e52098d5e998a8a338 SHA512 85a5784c35045e34428d4f1c985782885ae4875ce7b1fc6468f33616ce82c49be1b3dfd87aeb774624f2285c40d395449c603658171f68b72371b73a1647d87b
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/fwlogwatch/fwlogwatch-1.4.ebuild b/net-analyzer/fwlogwatch/fwlogwatch-1.4.ebuild
index d511245fa473..e6d861ab170f 100644
--- a/net-analyzer/fwlogwatch/fwlogwatch-1.4.ebuild
+++ b/net-analyzer/fwlogwatch/fwlogwatch-1.4.ebuild
@@ -7,7 +7,7 @@ inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="A packet filter and firewall log analyzer"
 HOMEPAGE="http://fwlogwatch.inside-security.de/"
-SRC_URI="${HOMEPAGE}sw/${P}.tar.bz2"
+SRC_URI="http://fwlogwatch.inside-security.de/sw/${P}.tar.bz2"
 
 KEYWORDS="amd64 ~ppc sparc x86"
 LICENSE="GPL-1"
diff --git a/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild b/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild
index 000c335caa62..aea5b6f8bc9e 100644
--- a/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild
+++ b/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild
@@ -7,7 +7,7 @@ inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="A packet filter and firewall log analyzer"
 HOMEPAGE="http://fwlogwatch.inside-security.de/"
-SRC_URI="${HOMEPAGE}sw/${P}.tar.bz2"
+SRC_URI="http://fwlogwatch.inside-security.de/sw/${P}.tar.bz2"
 
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 LICENSE="GPL-1"
diff --git a/net-analyzer/graphite-web/Manifest b/net-analyzer/graphite-web/Manifest
index a18da3d40962..9e93843f92ea 100644
--- a/net-analyzer/graphite-web/Manifest
+++ b/net-analyzer/graphite-web/Manifest
@@ -2,6 +2,6 @@ AUX graphite-web-1.1.3-fhs-paths.patch 2714 BLAKE2B 3c2e4a73e32626ba28ee1c3f5697
 AUX graphite-web-1.1.5-fhs-paths.patch 2712 BLAKE2B f3a05cd9a732ee69d52a62ac5164b3e8bdc5e1d29d3474167c2873f4322a882509f60908731a081f971c01681094f2b6a772a4fcf159ade85ac651f7b0d90c1c SHA512 b383da7aebf0c38b557ac07b0ba4ecd22c41bb9f3318a9f491b37f495a8d2ad5cd8d677076c15958d6326aa1a46574c01a8f5a9cd64fb77ac30fc4d630e8f532
 DIST graphite-web-1.1.3.tar.gz 1171342 BLAKE2B f18c84d707f93d897553ec05d7b910a3dba97c6068498d1b216f178ea8a1f64baf59bb572b433a56f5e417a2873c018a38a19c3b8c765f667d7c3fbb38b9ed0a SHA512 3f9de216bd55e4e8de7391087e9b876a16e4f137fd60932a6d5855804c3d9868422645177776258e74486b97ec7a853b63a6d89b1de9b325bcb50ad694208436
 DIST graphite-web-1.1.5.tar.gz 1173809 BLAKE2B 94a1b4deab3159d3bde2d3c8b6f9664f39942cb1b815ce042b196be3c0e769ee1acac4b619135e9471360849308b90e02e1df4f7d6b7d0ef31e46d38ee2425e5 SHA512 b2097609ca77a40e6e7d83a3141335e2208d69e7f4edbac8ce3505ed9dd654589836a3b3498bfb7f7585332bceeb8e367f0c10f3cf6afdb5ad6b96377338a7bb
-EBUILD graphite-web-1.1.3-r1.ebuild 3090 BLAKE2B 8fce95ada9ffb932655767a1c123aa3f4e4ec2080823b41a433b29dd709ec7742d2d479d680479fcdd2f0bc1b02d400cf09dd23dfd9432edcd369badafb8e6d9 SHA512 61884e3a81d26ca4825101d8c2d3b02110293e0ead60c82688f33e4e1cb8f9fb560d37cf38d9af874bbf996f821e61ce1aeaba15f98b05216276c4cf00d0d7d4
-EBUILD graphite-web-1.1.5.ebuild 3120 BLAKE2B c8cc498e2c8fcf05779882b5a8864d136d92033788c24e847a1578832e14e4b15cb71cbc9d06f9c74e764459697eb7a5f5cd02a79271e9d370ca4f1ff2d34364 SHA512 b9d3768ed3e8772a80ac168446af939abc11d10f26a95e6ab38b79365735d7173cdf7fd9e2a4f3accc3b5ca4ddbdd4e6081688b7926480b2ddae52b055530620
+EBUILD graphite-web-1.1.3-r1.ebuild 3070 BLAKE2B 749d592c00234f530bb8fb37984bfe087ea546e9651177a1246bc00a9758c616b78f5030d37fa67f6fad3401a0ececb5ec4428ae2d73fc3df412cea49a6d2c91 SHA512 7db1218772eb9dcf10fea99ef326d040131538b157c7d17d9f18df326c23d0e455a9418643366c67420d31459ed77fb84b8f90a23fccf2efc4a557fcff86db8c
+EBUILD graphite-web-1.1.5.ebuild 3100 BLAKE2B 060cbaef3a075dc24746bec0f98174c509841b8e698eaecb4a0e3bf1fdf19abe9ccb6ff5aa9e498503fc251fca1c0c6d3eab1ffb70b278058f6988b8f889b2cd SHA512 b95dbde4b0aa115c606b557eb00badd7a339d98010b30c72775be5787786213f5cbb2f750d075c27932de2ed3a967e8f3fd56f31f97cbc68afce8d7d74040831
 MISC metadata.xml 592 BLAKE2B 1c284eea68c1db410d55439c14dbf245651157c8f3cb2c77357e50ad8d4426e1c2faf8bd767095f49e9a711e84bbe8b5223aa26529d6dd9cd8dd08c3d8c7c75a SHA512 e9be9344db6989ed9d1d649fff05c4d05c72528097c6d921b5d0d31f9be65d1cfb02071356101f46ffddfa5b7a91785995ad59e15ba0fd78b75d785959051a98
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild
index f28381633f81..15d71752cb7d 100644
--- a/net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
-inherit distutils-r1 python-utils-r1 prefix
+inherit distutils-r1 prefix
 
 DESCRIPTION="Enterprise scalable realtime graphing"
 HOMEPAGE="https://graphiteapp.org/"
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.5.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.5.ebuild
index f52246ead385..4b7b32088923 100644
--- a/net-analyzer/graphite-web/graphite-web-1.1.5.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-1.1.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )  # 3.7 dropped due to dep-hell
+PYTHON_COMPAT=( python{2_7,3_6} )  # 3.7 dropped due to dep-hell
 
-inherit distutils-r1 python-utils-r1 prefix
+inherit distutils-r1 prefix
 
 DESCRIPTION="Enterprise scalable realtime graphing"
 HOMEPAGE="https://graphiteapp.org/"
diff --git a/net-analyzer/greenbone-security-assistant/Manifest b/net-analyzer/greenbone-security-assistant/Manifest
index 945b4c01bbdd..feeaeac3b0ec 100644
--- a/net-analyzer/greenbone-security-assistant/Manifest
+++ b/net-analyzer/greenbone-security-assistant/Manifest
@@ -1,24 +1,15 @@
-AUX greenbone-security-assistant-7.0.3-auth.patch 4606 BLAKE2B aa9698aea86c1f0253d4f9ce263c83bce8a440184693ec5e438435517a04a87e9e3df7990522a212e6509b61ee1455e4fb11ccb4aa434c01edb4027c8fb38e2d SHA512 8012de90a92518acd71716790730e7ca736e2b64be026a11fa648b569bfb4229813a39be134efa1b1c09ce394aaeb44db6d31687279a6f5468f7cc97bb1a54ba
-AUX greenbone-security-assistant-7.0.3-memleak.patch 1206 BLAKE2B 1349e2cf9d82fa9bc0b05bb471e4ad8c298a12c6ae0ecdc12a44f686440d5cc1b5f6bab8a7fb97a643e2457e99040da9aaf5f0285bbb6582131af3bda297803d SHA512 5ec8404ae8d8c40dc7d1d4cab7572888dc08cedf9c17e8e95e138b9441c34e5d0eeb24f066d15ef5b69d5da9f3a3bbc70ebb6eaf275763b3ec5583af9265652d
 AUX greenbone-security-assistant-8.0.1-cmakelist.patch 1122 BLAKE2B f675217b1cd2164ca8437a6fda22ef050134b3ace1323b111f3491ef23892b34f4398cd11d663daba7c5a0c2897ca9a736ea22c21eaf265e298df13b7ba1956c SHA512 1d725a6b43730675f0c499b5d27a0abc0d326ff9c5e3eb32da543651065e01e55321ee69ebef43f605f91caa619ae0d2a2386e174a822e0bc37a412f414a5659
 AUX greenbone-security-assistant-8.0.1-node.patch 1706 BLAKE2B a075c37a233679eb175a177e2605dd933b3c3d5440c0ae74075267d8f64d32afe2a7b4ae40b79692fef46020c5a5dd649c5f329ad1b786569219c339ad659043 SHA512 c5bbd495e9b5dd82896db841fde03a72c9937cbb3135123b578cb2dc8f86b8ed57226b7b46fc90e3587a94ca6505c61058669937bba1f6f7ad3d0953cb025ca9
 AUX greenbone-security-assistant-8.0.1-pid.patch 283 BLAKE2B 15f3c15da9cc198a0bb933d867c476d505fc11321026a723b4a2826856439edd6f402e14ce2efd4353de84988da3c7f6b7b30f6a404b9301123205bd73d83e4c SHA512 224c29d800e3bd3a79d9386fdbfff7f9e77f4e4abd750513b7ee2b6c1bafe2294517ae804b8a4e7b62ce015755827b71e8422628e28e184a0d8e58d6973b0b14
 AUX greenbone-security-assistant-8.0.1-reactjs.patch 988 BLAKE2B b2e7929ac17d9bd8f7d2ef964b8ab479245a105a42c7c27cb1c0533014c93335683a465b2e67e324d692a61561a912aea484604cd650e79ebcc64390fb214556 SHA512 6dbff78f70620983ada5918d5ebc06b5a2f1077cffcf8b74fdb217fd7df45648c0b6b06367ca9b894b0106cdc7f4be1c05e926c0b9f5819507a548fc3fc26d84
 AUX greenbone-security-assistant-8.0.1-sbin.patch 361 BLAKE2B dfa390d0545a470c73af5cc24059e09967a9134a9f361ba606450ce046999ba200198b8051b515d6c33361bcc33678037a65c7ba68f97f0ff140f0ce622fcacc SHA512 307ca36d757d6ec6e710b1d4ef14bc55a611f0b3b23eb1cf349faf5be298f3f5a6ba852900c2c9b5f03231627364dba021ce8fa3e4859fcfb65eb9049f18e292
 AUX greenbone-security-assistant-8.0.1-uninstall-snippet.patch 398 BLAKE2B 8f9b4c754e4406d6830c69d029a05a3525bce3553550931424a12710b4b88f37257a8415e7219e2714985bf2ed76134e52e52a867f03c35c675debd5cfb0d540 SHA512 b0e44673687b09421beff5eadd02b86a25d87c531144a7c2ec087f48dda4463588d8c462c3b51431f1b5f69d7241ccb86e1eb702ddc8dfeb1402f2a142b29a4d
-AUX gsa-daemon.conf 1166 BLAKE2B 2611553aa0aa13d105182bd12f7b6f79f94888458aaf142f67111a94bdd3b7c6fb33a8e33844977fb95e09a13d04595ddd5e789624be2eaacbbc78564c05d4ba SHA512 2f085e0b8df0f778b7c9446278d4748b5780abebaa4ac590e1d44280975f22e37d8fe12c2e05b0381391504f42d437597ab4a4880daf20f35315fb4e74753a6d
-AUX gsa.init 634 BLAKE2B 7a99d7bf37475df138acc3e8d3909f91ea4014d29315df8e912b0a3904a1bd7e58f3f527c5e6056d7318f7677f27658a230a37ed6dd2a862f55a8df6377d3668 SHA512 19f8401266923e9c5f86540401c0ac3a04986c442bc0c0b45206b50ff5bfb533291d635d3af91d70e6e4a251b8660815ee4f3beb30ad61e96e9d86b58e285f00
-AUX gsa.logrotate 134 BLAKE2B 56bd0128621688a1b1fc5cb0a96503e60b0a2975bfbe74b4db0853b45356610081996004923bc958b8d71ea8e5add097cc8083ce9cd83af38e87995d9386fc1d SHA512 e6164c4b494d87ad55a9b1120bad2cc8619a623382417e0301738e728c535ea78f89f935807eb7616ae7a17d05942f105a7c76795e636f9bcc672a04e3444149
 AUX gsa.nginx.reverse.proxy.example 3835 BLAKE2B c4ec87cd5f1a0e5aedb93f95c7010a3f19b9123355b24b2899c157a532b020ba192ee6f5a382448b17fe0ff1d8473be6a390e0779d3f8c3963d050d0f5c91775 SHA512 c323f37f4dd1bc4633213f9aede141e2a915344df7aa8e7be043583e6a5415ec8fefea707f1cab29f478423165f3285c629da683515f08d6e046385fb7177751
-AUX gsa.service 641 BLAKE2B 526736f052166e74eca48986609d3a688ba8562a57aee0136ab9d2cea9884e4c17ba8355e3e55cf30fbe6cf93b15d32e54b3a330d814d9116d65ccf8918d59fa SHA512 975d1a02041d25d2e21eefe73de0f083d2bb58e7a0da895ea9455d86941ae6ed2c952b282f05dd48f9706a0c4a883f6b58b9aa2af0b73c54cb91d8f3d703c91a
-AUX gsa.tmpfiles.d 28 BLAKE2B b9343651fc4923451b02a5f72cad7da95e4d790a7b77eb72ca239588568a5d2b88cad1f9f698ad61403c332a44005989e8d6e67ff1ad06cab26abdf67f8d8621 SHA512 b5d98625495353d32bdcaecf5499e2cbe3a8b1a84b067018b61f2ce6e110b0e3a14a061e8791c08891a7058976555a2c7971b48c90f690605129deb457b7b754
 AUX gsad-daemon.conf 416 BLAKE2B 7c6dff183ceb8afdbe7abb75333fb8aa570be406ecb18641e96d8045d793b6ef81b46acbfd243c4bb9a4bcb98cb6c039ebd0793c13855b7f5404e552a6088ef5 SHA512 7e696a3bb61310d7e8c553ed3744adb5fd60a75c83c0b9f99c76c092f78b4cf25d8b9c72b10d4a79ed501da16a27b8beddcda36f48acb550dfa01dbc19379f68
 AUX gsad.init 569 BLAKE2B 8fdfa94dd969e7947e1920c778034bd6db07ccf1be102e69a7c32cda0fb6111b7770d9458b4a86fad25629aba20768b8e6224d04c3d26088a253f665a9773e73 SHA512 806e669529fdaad52cf530df70aaa53889c3947f1dd3b6ec485501dca37fc2383452a7c2877ddca4e23e344f5bef612bbdbee8ca9921f32c907cccb6ced61a28
 AUX gsad.logrotate 325 BLAKE2B 00fb4953308bbfb47f328a88541778adb2f8523108b72058e16f6e93c4c55b01bf668c57b0151555401d3bc989f3b8e5a4cb872f1b2cbae691a40dd590facb40 SHA512 ab43f8c54cf72e2a800bdcf4daebeabfa18a7ef49f098d65e70f97ccab3d36606c353b82b8fd6b4f2cecd289d36f48f805a5c34cba86f8e8c61bf074b0afe695
 AUX gsad.service 434 BLAKE2B 43ac179a66d1f4ddeecddae1804ff9bbb48ddce7e7cd18feff6c5ca681ecd5f6401e1a26b94b6f5d5e83a9e59bcccf2f773edca50d1d2f9abca0934ac813fd40 SHA512 d842531486d852b710b512a631ddde75bdfaee1db097e024f0de439d9c8c3ed699f7116a685650f1acf23b1be982987d38bc16a0c3bd4c6405b16c8cffc5a476
-DIST greenbone-security-assistant-7.0.3.tar.gz 2918954 BLAKE2B 4a6cd5d8378bcbb0a9df6cb5b8f6560060f15d0b0cb53d2c61692cb2bc2cd86af6e9cdeb5040c4d7020c3b016779a76ec517d54614388c62aaedd596f55fa3c4 SHA512 7e1c1ef939ba08dab3b78baf1aa9c110be2febfbed5d67eefe8110c60f5089a1af44bc26693657226f417c6bd516a4a656eb159dae2a78f878e1a1b6c222b117
 DIST greenbone-security-assistant-8.0.1-node_modules.tar.gz 34084175 BLAKE2B 17c9e24961b63b957f932e4c5970113499ad65655b42e624284fb22a495d50c12e5f8289da4e17db717885b65909a6e18213fa312052c9c06c9bdc37816204f1 SHA512 552ea55fe218ae2345fa45b43af349825f255ccd86137dd245679efe6abc805d16c4ced3599f644d9b9f2686047b486d5e0c8aa4eaa0cbbf13157b9e2dbc8cc2
 DIST greenbone-security-assistant-8.0.1.tar.gz 1558918 BLAKE2B 75287784ed215300cfb30101d39b06b134092ca2d4311bcca976be23cc289529c6a8d661b99cb28e890c68f27e93a9259681add067749a772b7e3aea28761f3b SHA512 b91c1c4b8073c3ad3d3d636abbaa7881393f1448eae7366636ff618391c199c240e6bc4c848740a4267b4142aa872fb91c0798b8034d152d16016e650fbda2b8
-EBUILD greenbone-security-assistant-7.0.3-r1.ebuild 2083 BLAKE2B 5ae58fee712384339facec71085f9d1f8b5344605cfaa9187041d1e27cfc92276a4dbe2f56ffef3ae6317339b04da680dd1a702d49ce9e710cd7c10bb89f04bd SHA512 03adc25258afd8be87e5565f02712069513e03b3be1cb0c31b4468fdf148eea6dd9a30a43be8a4ab5460ebe1ec71ffb4ec334ba80377db88e5eca864488bf97a
-EBUILD greenbone-security-assistant-8.0.1.ebuild 3367 BLAKE2B 76811d4d6b361238845beba2a41996eec4552b07f3705389182228210508a1d88dbf9b29f01c6db25664de6e9ec6834448a88b0a2423bd5c3bfcb5e8e4ae9330 SHA512 d5ecb70f8b6b3567b619908ab6a23a54662e0572789869441238dcd566d0610763afe9c61a03e4c10e27d25673dedd66a20b65e8277adb0db82a33b67112e544
+EBUILD greenbone-security-assistant-8.0.1-r1.ebuild 3249 BLAKE2B 4b5d19930f9f1156961b4f9fb82e8393193d752aea82212f3f5c7ad3044bc9a1b6a7ac5cfe5f6f7bed174a7092caf28435ab74a2a4e994066d5cde73a9ab943d SHA512 50d53ec5df7ec44cf5ee483072903a0885b84a5c6c5fba1d8e1dd76450f14782479599096ab61bc7b4d70aa4ae95454fe088e731d94f04b71918cdf43d2ac892
 MISC metadata.xml 961 BLAKE2B cd5edd05b4ebc657f40a20a5edf6d33e065ecd5ae6971c36c1640999b1f4e05382363f288cf57dd56ad8c4cdebd307cbaf86fb80b31ef478e278e03293dfe72a SHA512 a5d74e05d38115b2741f5d4f8a781a07a434976dbad9c427701f50a38efc5db5d18f03bd6e2eaf617c7e6c05c2616249babb0bc5dc857f16a509fff85598d3e4
diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-7.0.3-auth.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-7.0.3-auth.patch
deleted file mode 100644
index cce885e10e01..000000000000
--- a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-7.0.3-auth.patch
+++ /dev/null
@@ -1,107 +0,0 @@
---- gsa-7.0.3/src/gsad_omp.c	2019-02-02 03:22:19.297954361 +0300
-+++ gsa-7.0.3/src/gsad_omp.c	2019-02-02 03:27:57.690214371 +0300
-@@ -1366,7 +1366,8 @@
-           || (strstr (param_name, "_id")
-                 == param_name + strlen (param_name) - strlen ("_id"))
-           || (strcmp (param_name, "name") == 0
--              && strcasecmp (prev_action, "Run Wizard") == 0)
-+              && (strcasecmp (prev_action, "Run Wizard") == 0
-+                  || strcasecmp (next_cmd, "auth_settings") == 0))
-           || (strcmp (param_name, "get_name") == 0
-               && strcasecmp (next_cmd, "wizard_get") == 0))
-         {
-@@ -25984,7 +25976,7 @@
- 
-   html = response_from_entity (connection, credentials, params, entity,
-                                (no_redirect && strcmp (no_redirect, "0")),
--                               NULL, NULL,
-+                               NULL, "auth_settings",
-                                NULL, "modify_auth",
-                                "Save Authentication Configuration",
-                                response_data);
---- gsa-7.0.3/src/html/classic/js/greenbone.js  2018-03-28 16:23:57.000000000 +0300
-+++ gsa-7.0.3/src/html/classic/js/greenbone.js  2019-02-02 03:40:37.162714538 +0300
-@@ -1559,6 +1559,9 @@
-           if (reload === 'next') {
-             reload_next(response);
-           }
-+          else if (reload === 'window') {
-+            location.reload();
-+          }
-         },
-         function(jqXHR) {
-           if (jqXHR.status == 0 && jqXHR.readyState == 0) {
---- gsa-7.0.3/src/html/classic/omp.xsl	2018-03-28 16:23:57.000000000 +0300
-+++ gsa-7.0.3/src/html/classic/omp.xsl	2019-02-02 03:44:28.470599715 +0300
-@@ -36775,7 +36822,8 @@
- <!-- AUTHENTICATION DESCRIPTION -->
- 
- <xsl:template match="group" mode="ldapauth">
--  <div class="section-box" id="ldap-box">
-+  <div class="section-box ajax-post" id="ldap-box"
-+      data-button="form #save_button" data-reload="window">
-     <form action="/omp" method="post" enctype="multipart/form-data">
-       <input type="hidden" name="token" value="{/envelope/token}"/>
-       <input type="hidden" name="cmd" value="save_auth"/>
-@@ -36784,6 +36832,15 @@
-       <input type="hidden" name="filter" value="{gsa:envelope-filter ()}"/>
-       <!-- group name is e.g. of method:ldap -->
-       <input type="hidden" name="group" value="{@name}"/>
-+      <!-- Auth type name for next page -->
-+      <input type="hidden" name="name" value="ldap"/>
-+
-+      <div class="error-dialog">
-+        <div class="text-center">
-+          <xsl:value-of select="gsa:i18n ('LDAP authentication config could not be modified.')"/>
-+        </div>
-+      </div>
-+
-       <table class="gbntable">
-         <tr class="gbntablehead2">
-           <td><xsl:value-of select="gsa:i18n ('Setting')"/></td>
-@@ -36838,7 +36895,8 @@
-         </tr>
-         <tr>
-           <td colspan="2" style="text-align:right;">
--            <input type="submit" name="submit" value="{gsa:i18n ('Save')}"/>
-+            <input type="submit" name="submit" id="save_button"
-+                   value="{gsa:i18n ('Save')}"/>
-           </td>
-         </tr>
-       </table>
-@@ -36847,7 +36905,8 @@
- </xsl:template>
- 
- <xsl:template match="group" mode="radiusauth">
--  <div class="section-box" id="radius-box">
-+  <div class="section-box ajax-post" id="radius-box"
-+      data-button="form #save_button" data-reload="window">
-     <form action="/omp" method="post" enctype="multipart/form-data">
-       <input type="hidden" name="token" value="{/envelope/token}"/>
-       <input type="hidden" name="cmd" value="save_auth"/>
-@@ -36856,6 +36915,15 @@
-       <input type="hidden" name="filter" value="{gsa:envelope-filter ()}"/>
-       <!-- group name is e.g. of method:radius_connect -->
-       <input type="hidden" name="group" value="{@name}"/>
-+      <!-- Auth type name for next page -->
-+      <input type="hidden" name="name" value="radius"/>
-+
-+      <div class="error-dialog">
-+        <div class="text-center">
-+          <xsl:value-of select="gsa:i18n ('Radius authentication config could not be modified.')"/>
-+        </div>
-+      </div>
-+
-       <table class="gbntable">
-         <tr class="gbntablehead2">
-           <td><xsl:value-of select="gsa:i18n ('Setting')"/></td>
-@@ -36890,7 +36958,8 @@
-           </tr>
-         <tr>
-           <td colspan="2" style="text-align:right;">
--            <input type="submit" name="submit" value="{gsa:i18n ('Save')}"/>
-+            <input type="submit" name="submit" id="save_button"
-+                   value="{gsa:i18n ('Save')}"/>
-           </td>
-         </tr>
-       </table>
diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-7.0.3-memleak.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-7.0.3-memleak.patch
deleted file mode 100644
index 5132e344a798..000000000000
--- a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-7.0.3-memleak.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- gsa-7.0.3/src/gsad_omp.c	2018-03-28 16:23:57.000000000 +0300
-+++ gsa-7.0.3/src/gsad_omp.c	2019-02-02 03:12:16.617046562 +0300
-@@ -7737,16 +7738,21 @@
-   g_string_append (xml, command_escaped);
-   g_free (command_escaped);
- 
-+  response = NULL;
-   ret = omp (connection, credentials, &response, &entity, response_data,
-              command->str);
-   g_string_free (command, TRUE);
-+
-+  if (ret)
-+    {
-+      free_entity (entity);
-+      g_string_free (xml, TRUE);
-+    }
-+
-   switch (ret)
-     {
-       case 0:
-         break;
--      case -1:
--        /* 'omp' set response. */
--        return response;
-       case 1:
-         response_data->http_status_code = MHD_HTTP_INTERNAL_SERVER_ERROR;
-         return gsad_message (credentials,
-@@ -7770,10 +7776,14 @@
-                              "/omp?cmd=get_tasks", response_data);
-     }
- 
-+  if (omp_success (entity) == 0)
-+    set_http_status_from_entity (entity, response_data);
-   g_string_append (xml, response);
- 
-   g_string_append (xml, "</get_aggregate>");
- 
-+  free_entity (entity);
-+  g_free (response);
-   return xsl_transform_omp (connection, credentials, params,
-                             g_string_free (xml, FALSE), response_data);
- }
diff --git a/net-analyzer/greenbone-security-assistant/files/gsa-daemon.conf b/net-analyzer/greenbone-security-assistant/files/gsa-daemon.conf
deleted file mode 100644
index 2c9a62eef811..000000000000
--- a/net-analyzer/greenbone-security-assistant/files/gsa-daemon.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-# OpenVAS Security Assistant command args
-# man page --> https://www.mankier.com/8/gsad
-
-# e.g. --foreground | e.g. --no-redirect -- > Don't listen port 80 anymore
-OPENVAS_SECURITY_ASSISTANT_OPTIONS="--no-redirect"
-
-# WebUI adress
-OPENVAS_SECURITY_ASSISTANT_LISTEN_ADDRESS="--listen=127.0.0.1"
-
-# WebUI Port
-OPENVAS_SECURITY_ASSISTANT_LISTEN_PORT="--port=9392"
-
-# WebUI Manager Address
-OPENVAS_SECURITY_ASSISTANT_MANAGER_LISTEN_ADDRESS="--mlisten=127.0.0.1"
-
-# WebUI Manager Port
-OPENVAS_SECURITY_ASSISTANT_MANAGER_LISTEN_PORT="--mport=9390"
-
-# TLS Settings
-OPENVAS_SECURITY_ASSISTANT_GNUTLS_PRIORITIES="--gnutls-priorities=NORMAL"
-
-# If you use reverse proxy you must set OPENVAS_REVERSE_PROXY daemon arg
-# otherwise you will get the below error.
-# --------------------------------------------------------------- 
-# The request contained an unknown or invalid Host header. 
-# If you are trying to access GSA via its hostname or a proxy, 
-# make sure GSA is set up to allow it.
-# ---------------------------------------------------------------
-
-# Reverse Proxy Settings ( e.g. --allow-header-host=subdomain.example.com )
-OPENVAS_REVERSE_PROXY="--allow-header-host="
diff --git a/net-analyzer/greenbone-security-assistant/files/gsa.init b/net-analyzer/greenbone-security-assistant/files/gsa.init
deleted file mode 100644
index 2b4636422422..000000000000
--- a/net-analyzer/greenbone-security-assistant/files/gsa.init
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-name="Greenbone Security Assistant Daemon"
-command="/usr/sbin/gsad"
-command_args="${OPENVAS_SECURITY_ASSISTANT_OPTIONS} ${OPENVAS_SECURITY_ASSISTANT_LISTEN_ADDRESS} ${OPENVAS_SECURITY_ASSISTANT_LISTEN_PORT} ${OPENVAS_SECURITY_ASSISTANT_MANAGER_LISTEN_ADDRESS} ${OPENVAS_SECURITY_ASSISTANT_MANAGER_LISTEN_PORT} ${OPENVAS_SECURITY_ASSISTANT_GNUTLS_PRIORITIES} ${OPENVAS_REVERSE_PROXY}"
-pidfile="/var/run/gsad.pid"
-command_background="true"
-
-depend() {
-	after bootmisc
-	need localmount net openvas-scanner gvmd
-}
diff --git a/net-analyzer/greenbone-security-assistant/files/gsa.logrotate b/net-analyzer/greenbone-security-assistant/files/gsa.logrotate
deleted file mode 100644
index 79e54e854319..000000000000
--- a/net-analyzer/greenbone-security-assistant/files/gsa.logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-# logrotate for openvas security agent
-/var/log/openvas/gsad.log {
-	daily
-	rotate 7
-	compress
-	missingok
-	notifempty
-	sharedscripts
-}
diff --git a/net-analyzer/greenbone-security-assistant/files/gsa.service b/net-analyzer/greenbone-security-assistant/files/gsa.service
deleted file mode 100644
index bc8c1d9e285c..000000000000
--- a/net-analyzer/greenbone-security-assistant/files/gsa.service
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=OpenVAS Manager
-After=network.target
-After=openvas-scanner.service
-After=gvmd.service
-Wants=gvmd.service
-
-[Service]
-Type=forking
-EnvironmentFile=-/etc/openvas/sysconfig/gsa-daemon.conf
-ExecStart=/usr/sbin/gsad $OPENVAS_SECURITY_ASSISTANT_OPTIONS $OPENVAS_SECURITY_ASSISTANT_LISTEN_ADDRESS $OPENVAS_SECURITY_ASSISTANT_LISTEN_PORT $OPENVAS_SECURITY_ASSISTANT_MANAGER_LISTEN_ADDRESS $OPENVAS_SECURITY_ASSISTANT_MANAGER_LISTEN_PORT $OPENVAS_SECURITY_ASSISTANT_GNUTLS_PRIORITIES $OPENVAS_REVERSE_PROXY
-ExecReload=/bin/kill -HUP $MAINPID
-KillMode=mixed
-User=root
-Group=root
-TimeoutSec=1200
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-analyzer/greenbone-security-assistant/files/gsa.tmpfiles.d b/net-analyzer/greenbone-security-assistant/files/gsa.tmpfiles.d
deleted file mode 100644
index 18e820caec1b..000000000000
--- a/net-analyzer/greenbone-security-assistant/files/gsa.tmpfiles.d
+++ /dev/null
@@ -1 +0,0 @@
-d	/var/cache/openvassd 0775
diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-7.0.3-r1.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-7.0.3-r1.ebuild
deleted file mode 100644
index 6fc3cbaf5271..000000000000
--- a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-7.0.3-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake-utils systemd
-MY_PN="gsa"
-
-DESCRIPTION="Greenbone Security Assistant for OpenVAS"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="https://github.com/greenbone/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+ BSD MIT"
-KEYWORDS="~amd64 ~x86"
-IUSE="extras"
-
-DEPEND="
-	dev-libs/libgcrypt:0=
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=net-analyzer/openvas-libraries-9.0.3
-	net-libs/gnutls:=[tools]
-	net-libs/libmicrohttpd[messages]
-	extras? ( dev-python/polib )"
-
-RDEPEND="
-	${DEPEND}
-	~net-analyzer/openvas-scanner-5.1.3
-	>=net-analyzer/openvas-manager-7.0.3
-	extras? ( dev-texlive/texlive-latexextra )"
-
-BDEPEND="
-	virtual/pkgconfig
-	extras? ( app-doc/doxygen[dot]
-		  app-doc/xmltoman
-		  app-text/htmldoc
-		  sys-devel/gettext
-	)"
-
-BUILD_DIR="${WORKDIR}/${MY_PN}-${PV}_build"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-memleak.patch"
-	"${FILESDIR}/${P}-auth.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-	if use extras; then
-		doxygen -u "$S"/doc/Doxyfile_full.in || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr"
-		"-DLOCALSTATEDIR=${EPREFIX}/var"
-		"-DSYSCONFDIR=${EPREFIX}/etc"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use extras; then
-		cmake-utils_src_make -C "${BUILD_DIR}" doc
-		cmake-utils_src_make doc-full -C "${BUILD_DIR}" doc
-		HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /etc/openvas/sysconfig
-	doins "${FILESDIR}"/${MY_PN}-daemon.conf
-
-	insinto /etc/openvas/reverse-proxy
-	doins "${FILESDIR}"/gsa.nginx.reverse.proxy.example
-
-	newinitd "${FILESDIR}/${MY_PN}.init" ${MY_PN}
-	newconfd "${FILESDIR}/${MY_PN}-daemon.conf" ${MY_PN}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${MY_PN}.logrotate" ${MY_PN}
-
-	systemd_newtmpfilesd "${FILESDIR}/${MY_PN}.tmpfiles.d" ${MY_PN}.conf
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-}
diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1-r1.ebuild
index 6177f8f13836..ed0bcabf18ff 100644
--- a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1.ebuild
+++ b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake-utils flag-o-matic systemd toolchain-funcs
+inherit cmake flag-o-matic systemd toolchain-funcs
 
 MY_PN="gsa"
 MY_DN="gsad"
@@ -25,11 +25,10 @@ DEPEND="
 	dev-libs/libxslt
 	>=net-analyzer/gvm-libs-10.0.1
 	net-libs/gnutls:=
-	net-libs/libmicrohttpd[messages]"
+	net-libs/libmicrohttpd"
 
 RDEPEND="
 	${DEPEND}
-	!~net-analyzer/greenbone-security-assistant-7.0.3
 	~net-analyzer/openvas-scanner-6.0.1
 	>=net-analyzer/gvmd-8.0.1"
 
@@ -64,7 +63,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	# We will use pre-generated npm stuff.
 	mv "${WORKDIR}/${MY_NODE_N}" "${MY_NODE_DIR}" || die "couldn't move node_modules"
 	# Update .yarnrc accordingly.
@@ -93,21 +92,21 @@ src_configure() {
 	# Add release hardening flags for 8.0.1
 	append-cflags -D_FORTIFY_SOURCE=2 -fstack-protector
 	append-ldflags -Wl,-z,relro -Wl,-z,now
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	if use extras; then
-		cmake-utils_src_make -C "${BUILD_DIR}" doc
-		cmake-utils_src_make doc-full -C "${BUILD_DIR}" doc
+		cmake_build -C "${BUILD_DIR}" doc
+		cmake_build doc-full -C "${BUILD_DIR}" doc
 		HTML_DOCS=( "${BUILD_DIR}/${MY_DN}/doc/generated/html/." )
 	fi
-	cmake-utils_src_make rebuild_cache
+	cmake_build rebuild_cache
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	insinto /etc/gvm/sysconfig
 	doins "${FILESDIR}/${MY_DN}-daemon.conf"
diff --git a/net-analyzer/gvm-libs/Manifest b/net-analyzer/gvm-libs/Manifest
index 1d5ebd16e2dd..43039e828b22 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 2406 BLAKE2B 165415542d7d6a063e748d596ab2cdeeb8a1fb620edc452bee660551bd40b8cea3ad30d646d32e5d04c137eb27292a078a59fd70245670ee9cfab6b28d599ba6 SHA512 729365eea3bcd836b1262f89c7d3527261256b96dab37ed6fbef3296cbc856fa1daef1c5a17f2b368cabc26e9f73a5f4ef96093e2f00963dc03fdd04e1403275
+EBUILD gvm-libs-10.0.1.ebuild 2316 BLAKE2B ed1550e7098886438d6523764907e9960577273d82e128013696b6870ce7cd26663ed41b092538223355424211990beb642de28a741fa9e05082d21a9f312ca4 SHA512 0b22bac05bfaceba7eb0526778c2ec9e2f7363e3bb7555a5261ad18e0708550654618a7098c2ac561f465add54a80963b811c3cc4c2926cd91f4ad11bcce2c0b
 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 e62251e4c866..aa6cf0725a7c 100644
--- a/net-analyzer/gvm-libs/gvm-libs-10.0.1.ebuild
+++ b/net-analyzer/gvm-libs/gvm-libs-10.0.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake-utils flag-o-matic toolchain-funcs user
+inherit cmake flag-o-matic toolchain-funcs user
 
 DESCRIPTION="Greenbone vulnerability management libraries, previously named openvas-libraries"
 HOMEPAGE="https://www.greenbone.net/en/"
@@ -27,8 +27,7 @@ DEPEND="
 	radius? ( net-dialup/freeradius-client )"
 
 RDEPEND="
-	${DEPEND}
-	!net-analyzer/openvas-libraries"
+	${DEPEND}"
 
 BDEPEND="
 	sys-devel/bison
@@ -53,7 +52,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	# QA-Fix | Remove doxygen warnings for !CLANG
 	if use extras; then
 		if ! tc-is-clang; then
@@ -80,21 +79,21 @@ src_configure() {
 	# Add release hardening flags for 10.0.1
 	append-cflags -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -fstack-protector
 	append-ldflags -Wl,-z,relro -Wl,-z,now
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	if use extras; then
-		cmake-utils_src_make -C "${BUILD_DIR}" doc
-		cmake-utils_src_make doc-full -C "${BUILD_DIR}" doc
+		cmake_build -C "${BUILD_DIR}" doc
+		cmake_build doc-full -C "${BUILD_DIR}" doc
 		HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
 	fi
-	cmake-utils_src_make rebuild_cache
+	cmake_build rebuild_cache
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# Set proper permissions on required files/directories
 	keepdir /var/lib/gvm
diff --git a/net-analyzer/gvm-tools/Manifest b/net-analyzer/gvm-tools/Manifest
index e162b3c70b04..994912462413 100644
--- a/net-analyzer/gvm-tools/Manifest
+++ b/net-analyzer/gvm-tools/Manifest
@@ -1,5 +1,3 @@
-DIST gvm-tools-1.4.1.tar.gz 52020 BLAKE2B 0648c7e26dc0aed02eeeafdc8db45ae88afd8725196457a6a8cdcb888ed7e07c9998fc83c03fd9dd4f7aca1e238b46052653216b7373f98b150f6a181ba1538c SHA512 cd1049311241ad7b4a2d9648b54224ca1636f9620ffd238282bbf1089ab0c3b4e8b8f722c93c6809695bc71b0c7cb2bc3e65561b05269c7737abdc6ddca69aea
 DIST gvm-tools-2.0.0.tar.gz 114592 BLAKE2B 73532138f4153ce625e68d4feb477bea4504be910266d6dac113caff1da096bc6072649ddc456b3348e1aba79c9b7e147ba019a70e4163267c474850019a076e SHA512 0adf7e06b1208c91fbc02dab42593280c95f6572e27d96d6f8777d710747a9e427c79678d9aef785b7ecd6d4fd30e79a1c063fe4256025ac0616c1d242f45025
-EBUILD gvm-tools-1.4.1.ebuild 988 BLAKE2B 1916eb91f678818b18c5add2ad1a2b4ffd17b3a78590973f81491bdf35311db3b58b2ace82e1b2684bf465a0853aa4639c477656dacfc3d8bce3315aa3f95061 SHA512 8b4b39754d89a9168b604eeb920648cdb42df5be595a941cc1a18ff9801ecaef61a217d865455ed7a5c4713da9a7bb5f34b1331b2c0451f04a4ea93b4d85303d
-EBUILD gvm-tools-2.0.0.ebuild 1017 BLAKE2B 7e6ba6f64a33ce10ae5dd33c0e0439ace14201602232f82f51f46467ec1201ceb31865fbebb3d2aa189b44f1e59829540fdd18730015400dfb6ff61564b90ed4 SHA512 8499e2acda6aed44fa811fccdd4df5a575e2f190d1d56f3007c7a19071791857dbd07458aa62570c7002b0a2e154698d5476f12308ee6fdb328290da5dffedbc
+EBUILD gvm-tools-2.0.0.ebuild 1013 BLAKE2B 1d9369c6e19f549849332f76b38da6abb356ded43e4715506333d0979276c3dcaf24306586470f983024943a928fe9e4cdfb69e4fdda1b9420c55314a6673edc SHA512 fef35d8711e3df6b281d0496e5a0e4a0df69202d9451d85317ad1a14e8ad2108f1705de8687ffa6bdd8c1fce158e3e7c095014308b94be871a9bf456dbd8ba90
 MISC metadata.xml 879 BLAKE2B 3fbe5d9d66b98ce42e4ba158d42cd2018b41b0b505932cd4d17e6ef0555e4622bd1c12020af18ff79f155009127ebe2681b1a6eb5b062fb0d65dcefc0b24c0f1 SHA512 38beadc54c27ab14b71eff900e70242dba92d5971dbddecec45d85c844b225d6abb50584a08f825c7b70092dcb489b7fc17eeaad0f9db7ab607fc1c078ef622e
diff --git a/net-analyzer/gvm-tools/gvm-tools-1.4.1.ebuild b/net-analyzer/gvm-tools/gvm-tools-1.4.1.ebuild
deleted file mode 100644
index 7de92b28c91c..000000000000
--- a/net-analyzer/gvm-tools/gvm-tools-1.4.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6} )
-inherit distutils-r1
-
-DESCRIPTION="Remote control for Greenbone Vulnerability Manager, previously named openvas-cli"
-HOMEPAGE="https://www.greenbone.net/en/"
-SRC_URI="https://github.com/greenbone/gvm-tools/archive/v1.4.1.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/pythondialog:0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	!net-analyzer/openvas-cli"
-
-DEPEND="
-	${RDEPEND}"
-
-src_prepare() {
-	distutils-r1_python_prepare_all
-	# Exlude tests & correct FHS/Gentoo policy paths
-	sed -i "s/packages=find_packages(),.*/packages=find_packages(exclude=['tests*', 'docs']),/" "$S"/setup.py || die
-	sed -i -e "s*''*'/usr/share/doc/${P}'*g" "$S"/setup.py || die
-}
diff --git a/net-analyzer/gvm-tools/gvm-tools-2.0.0.ebuild b/net-analyzer/gvm-tools/gvm-tools-2.0.0.ebuild
index 8800b1ff58ba..5a3779fa72e7 100644
--- a/net-analyzer/gvm-tools/gvm-tools-2.0.0.ebuild
+++ b/net-analyzer/gvm-tools/gvm-tools-2.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Remote control for Greenbone Vulnerability Manager, previously named openvas-cli"
diff --git a/net-analyzer/gvm/Manifest b/net-analyzer/gvm/Manifest
index 29c79cbe30ad..8c60262a10ce 100644
--- a/net-analyzer/gvm/Manifest
+++ b/net-analyzer/gvm/Manifest
@@ -1,2 +1,2 @@
-EBUILD gvm-10.0.1.ebuild 1312 BLAKE2B a6ebb5b0cd8941af6cd380af71153beaceca088479ea254b4be86efc3c462fe51cf8d4c6b6990e566b96f1e4a33378cdb58a1262ffa2a0779f5e585107db93be SHA512 69dd297a2e8083031d365fec7b9f0708d027eac6db1b9b9479e4d887884d116021d5b7ef47efc80453e92a838b1e0071d78d11fc5e958220b317353b5c35e7e1
+EBUILD gvm-10.0.1.ebuild 1291 BLAKE2B a33df3a9c6f273df51af9c3d134c3baba7d3321a6f39e9a1a7c80876700737aa0ff60527acd110888d4841a37950209acc823ff495e967795b1953dae53186d2 SHA512 5ea04eeacbf75133c3d5bea1f6599ac861a0e2bde70194f9175180b6e54d409d1817bd75e19c0d4a956ee6448ffe14705e8c54e824dd45c399536d8e27ddc412
 MISC metadata.xml 1178 BLAKE2B 69832f118fc0ccbb384a8d7c52f45bc1bba5300bd027bcae2c692261a1226a1a9b2ec6d556225a6c4ad942a61e1dfff0733d5c3b52b815c4592409df5d5afb87 SHA512 c700eb2605fc7b56acf34eb425483024dc2d952ea9a674ef932f2eb512144ba2b176bf1c12cec6ea9351c6f9160a40c6cfaa9b811483c924e6ce06a52d898377
diff --git a/net-analyzer/gvm/gvm-10.0.1.ebuild b/net-analyzer/gvm/gvm-10.0.1.ebuild
index a1811d22fb5d..7624312b1a47 100644
--- a/net-analyzer/gvm/gvm-10.0.1.ebuild
+++ b/net-analyzer/gvm/gvm-10.0.1.ebuild
@@ -17,11 +17,10 @@ REQUIRED_USE="|| ( postgres sqlite )"
 RDEPEND="
 	>=net-analyzer/gvm-libs-10.0.1[extras?,ldap?,radius?]
 	>=net-analyzer/gvmd-8.0.1[extras?,postgres?,sqlite?]
-	~net-analyzer/openvas-scanner-6.0.1[cron?,extras?]
-	!net-analyzer/openvas
-	cli? ( >=net-analyzer/gvm-tools-1.4.1 )
-	gsa? ( ~net-analyzer/greenbone-security-assistant-8.0.1[extras?] )
-	ospd? ( >=net-analyzer/ospd-1.3.2[extras?] )"
+	>=net-analyzer/openvas-scanner-6.0.1[cron?,extras?]
+	cli? ( >=net-analyzer/gvm-tools-2.0.0 )
+	gsa? ( >=net-analyzer/greenbone-security-assistant-8.0.1[extras?] )
+	ospd? ( >=net-analyzer/ospd-2.0.0[extras?] )"
 
 pkg_postinst() {
 	elog "Additional support for extra checks can be get from"
diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest
index 5822f9a378e2..fe36dc3d38de 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 3026 BLAKE2B 500e85e5773cdf5b562e80f835467d4aeb07759f132ead5168e40d5f0978b550cdfbb31f8cab815eee7658232eac8f10fb70f009ca9b021d2142e0c79cbc578e SHA512 8cf597e3a3f2de5ad57b6499a6cc275764d6ee5d3b1957cb12ec62fa532e0f89ade5ae4b299d46de90b4fda4a97bd0f08159a9c6a4fb5cda0fcc6e02e11dbede
+EBUILD gvmd-8.0.1.ebuild 2938 BLAKE2B 2987e33ba66d99eec4f77ceb49f4e8a214d7dc32bc3f5c937e78d73bed550e0fa19f746109c6543c1fc5b04a31c659254fe5b3d8099fdd853417fdd77e952802 SHA512 027af07c0b11c5a10cbb2fa6f9d1ffaedfce94c4aad51b4e0d38ea67614ea6503acc994425a5aaafe5d929862e337cf63fa9d9d283ee43beefb3c2c0542fb191
 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 2c6da5d39c1e..adb7ef65163d 100644
--- a/net-analyzer/gvmd/gvmd-8.0.1.ebuild
+++ b/net-analyzer/gvmd/gvmd-8.0.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake-utils flag-o-matic systemd toolchain-funcs
+inherit cmake flag-o-matic systemd toolchain-funcs
 
 DESCRIPTION="Greenbone vulnerability manager, previously named openvas-manager"
 HOMEPAGE="https://www.greenbone.net/en/"
@@ -28,7 +28,6 @@ DEPEND="
 
 RDEPEND="
 	${DEPEND}
-	!net-analyzer/openvas-manager
 	~net-analyzer/openvas-scanner-6.0.1"
 
 BDEPEND="
@@ -49,7 +48,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	# QA-Fix | Use correct FHS/Gentoo policy paths for 8.0.1
 	sed -i -e "s*share/doc/gvm/html/*share/doc/gvmd-${PV}/html/*g" "$S"/doc/CMakeLists.txt || die
 	sed -i -e "s*/doc/gvm/*/doc/gvmd-${PV}/*g" "$S"/CMakeLists.txt || die
@@ -77,21 +76,21 @@ src_configure() {
 	# Add release hardening flags for 8.0.1
 	append-cflags -Wno-nonnull -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -fstack-protector
 	append-ldflags -Wl,-z,relro -Wl,-z,now
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	if use extras; then
-		cmake-utils_src_make -C "${BUILD_DIR}" doc
-		cmake-utils_src_make doc-full -C "${BUILD_DIR}" doc
+		cmake_build -C "${BUILD_DIR}" doc
+		cmake_build doc-full -C "${BUILD_DIR}" doc
 		HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
 	fi
-	cmake-utils_src_make rebuild_cache
+	cmake_build rebuild_cache
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	dodir /etc/gvm
 	insinto /etc/gvm
diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest
index 69a97956abf1..6036f1c717d2 100644
--- a/net-analyzer/hydra/Manifest
+++ b/net-analyzer/hydra/Manifest
@@ -4,7 +4,7 @@ DIST hydra-8.1.tar.gz 559031 BLAKE2B a3d2b52508a1d03a2f3d6cecf7100543487b5a0f621
 DIST hydra-8.9.1.tar.gz 1186320 BLAKE2B 97c29cda5e26197ed66aa29555b0e4de3ef5b08bf65aa09fd0d564ee5f63825af71d6a41c4552a06a4c86a98dab5a69913c0b0200fe4e5068284ec7fc1f1061b SHA512 68b07dcb22bc55937e79035954417d820691e3a1eea169c959886ce6a741f545efe7879f31f41a1751779c923410dcc67fe8914bb9b5cf567edfc6fad3997d72
 DIST hydra-9.0.tar.gz 1168498 BLAKE2B b4834c66fb1bebcd19151784b75d4c9220cbf7045b289a063a1cbc48a793abfa2edcb466d43234bd4c8e14074a2e2a39ccd697698392f24f39c84da54ee07165 SHA512 58067bd2696e82645bb959fe5537f2876e1d8c170a15fe6a9ac65bbdc33cfb75b47fd1a969c314a6c6d91b2b6c0ce4ba087680bbd67a5a38925a2a8b5c5ad338
 EBUILD hydra-8.1.ebuild 2231 BLAKE2B 95092e808318ddde9e4dfdffde525efba03a9327fcee14ea7e3b02c21b823d9d2b546a4a60e69d045fc2866ad30660ab796406a09c520aa4d09d1933a8fe1df2 SHA512 77b003b5e8c5118dc81c318974ae2af2b0e973a272eccf3666ada23ed2712762792c725c1d2f5b3bb1df37277d3a6951ea92dd3995ea79ec97bb053ab339cac5
-EBUILD hydra-8.9.1.ebuild 2366 BLAKE2B ba12d4eca5289fcb1142dafd6114a037097ebcf61e3cdf08c0befacdcbd799358b8db0df251201bcb3a9e690063c3a6b7bafe2917b3bb2fdfff4acbdfeae761c SHA512 1888c365da61c5e2e873dc4c7d76cc0f0e30d6638d9416df8857deb84bc844e7ae0ce3f71c897c1eedd1b9e1efdcbdef9b1cd9eac23b89df4b4a5147a6f68bdc
-EBUILD hydra-9.0.ebuild 3631 BLAKE2B 579a695af32dfb017464ce8e16937b396b1b31a3bfb56c099c758a740096e5af5809664d87cd0152a9b15c4d0fefeccdf7163a0960a942cb9e1ff7456ac90c8c SHA512 7ee4d35e0122af56ebe7403a374947b605c00321f7719c27c2723c48c8e8ce98f4d75f7da59590f013f619469dc8cfd609db2d8c846823ca0ad5dc23ec8f3654
-EBUILD hydra-9999999.ebuild 3571 BLAKE2B 1bdb57bf900c1a3a3ae3e63858cef8dec1408d544f101d90485f11cb7705bafce7e708ee2006bed412e0cdb31238e8bd9719014ec416540d6f7ab88f1b7e8656 SHA512 dfd6138ea0fdcdd1c839eb1a2e094749e23cc6603c61e9975db6e5d94d792492c87fb918977307dde72fde2042690375b306c440280aad44c8d5ba622c2dcb77
+EBUILD hydra-8.9.1.ebuild 2394 BLAKE2B 942e94342043c63494b63125d11bce1b789245e7ef40b473736ec3d7b0f14f759e80607c73d1b0b0a938b8de89bc27e7ad5e1a8556498a428db316145bb4acff SHA512 78af7fbdf73aaf1e1cc7e35352f070eee13cd757f502c229fd9b30d6e807bf0360a7344ac1e8106ee3c8f590b6df4a650f4f251d4b7541849363ad040e03f303
+EBUILD hydra-9.0.ebuild 3659 BLAKE2B 2630cf4e6cb3c2fa8ef7bdc00cab68ec20cb65160027216082a8828f7209766b414f3aa3e028267335388d91f43631648c2740fff34758b236362f0d92952ff2 SHA512 506906ec7e84934468f99449dd53bcea8ebef07e8176f17792b2641791404aa8ffc343b9ff425bbff204095d01c7e90bcaff30b4cb8959d1d8aae004a8606a23
+EBUILD hydra-9999999.ebuild 3602 BLAKE2B 00bfabe6800b5f180343e001a7f2513a96b487b9186edf9943e27a0fcaf9c0aeb321ee392c06f6f4ae19783618b62d9e8cc6d618838fcf0621d066e6266f0b03 SHA512 55af31206a407598877cacd13112af5951ff730227dc2040bab8f388975777092f227fe2dc87d2adca0e9fd6b6550b87fe63b4c3aa1e194c7e2a6f9e5de1ce8d
 MISC metadata.xml 570 BLAKE2B fba8cf56f3f091fdf16a86ee3a1b964e9dfc0cae8a32e6fb81b8ccec3f1efe47dfac838c86fadd80e736d4a82233e8f84695c0a0987d4f426ab88fe0841df70f SHA512 45d0573055b0fe5f820e92cd43627e5c48dee8a1151ef06c7f65dddb8078ff62197bd5c8bbd1e1b12a42df61e399f2e3bff337201fa37df085339de24c8b50ba
diff --git a/net-analyzer/hydra/hydra-8.9.1.ebuild b/net-analyzer/hydra/hydra-8.9.1.ebuild
index 060223524177..ab4689369d20 100644
--- a/net-analyzer/hydra/hydra-8.9.1.ebuild
+++ b/net-analyzer/hydra/hydra-8.9.1.ebuild
@@ -6,9 +6,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="Parallelized network login hacker"
 HOMEPAGE="https://github.com/vanhauser-thc/thc-hydra"
-SRC_URI="
-	${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-"
+SRC_URI="https://github.com/vanhauser-thc/thc-hydra/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/net-analyzer/hydra/hydra-9.0.ebuild b/net-analyzer/hydra/hydra-9.0.ebuild
index c381eec6f1b1..fc776ea66b45 100644
--- a/net-analyzer/hydra/hydra-9.0.ebuild
+++ b/net-analyzer/hydra/hydra-9.0.ebuild
@@ -6,9 +6,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="Parallelized network login hacker"
 HOMEPAGE="https://github.com/vanhauser-thc/thc-hydra"
-SRC_URI="
-	${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-"
+SRC_URI="https://github.com/vanhauser-thc/thc-hydra/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/net-analyzer/hydra/hydra-9999999.ebuild b/net-analyzer/hydra/hydra-9999999.ebuild
index 419882a47354..9ef6f73c7ec4 100644
--- a/net-analyzer/hydra/hydra-9999999.ebuild
+++ b/net-analyzer/hydra/hydra-9999999.ebuild
@@ -6,7 +6,7 @@ inherit git-r3 toolchain-funcs
 
 DESCRIPTION="Parallelized network login hacker"
 HOMEPAGE="https://github.com/vanhauser-thc/thc-hydra"
-EGIT_REPO_URI="${HOMEPAGE}"
+EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-hydra"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/net-analyzer/ibmonitor/Manifest b/net-analyzer/ibmonitor/Manifest
index 4e8a84d10d33..e296547d75ed 100644
--- a/net-analyzer/ibmonitor/Manifest
+++ b/net-analyzer/ibmonitor/Manifest
@@ -1,3 +1,4 @@
 DIST ibmonitor-1.4.tar.gz 17025 BLAKE2B 33dcd54d3750b5e0dc70caaaf30f58f1dc2215cb2ba24174fafbfa356f27ae98133407505038df19104e9f8e1971ed4f8bf9ffeff37196d4640e90a4054970c6 SHA512 ef74dee22dbb88d07c37af9aaa0a0a49b6c49ff1b45a1637d06acbe32e4bc4e84d79cfe06ee7ba2b04d62fa3cfa0a10605eccde549d2fe04890dfa179adf20db
+EBUILD ibmonitor-1.4-r1.ebuild 434 BLAKE2B d89504185f9f6c378b20b20fb64e411e7220e079643d58b2c0fdd4fd67f401948a337fa566e656a75f1da317550b18928bd2cda0466d512b543d146c108c6e2c SHA512 49ac733724de8c67a929dc2799ab9706b3e639116c967c44935e988e9ba66cf0105c1a27693c3e1c3efcd70b440bccef874d144ec956f8396c7e1cf871d4c1c9
 EBUILD ibmonitor-1.4.ebuild 439 BLAKE2B 76e0911b86cda1372f75e177b9f4490db3d92c21831d5fb195c5e2101d79b208bd06e12ae0b8f6bd67810398305edad111f3956266731e91a0829504d483c18a SHA512 53f8da152024f2eb3db29855ddce44365c213e931901d7b567484d1977cb8ee8475447e9fb50c12ddfbc0ffb9383024b6285e5da3fc95b9785e302515c84196c
 MISC metadata.xml 359 BLAKE2B 8885ea2805f5ef76dbec58e1cddbbaf2df2ae0447ed5448788afeff96f35b51d62f07fe05e86f7ff34f6890b2b88bd66155c815c6681c6dc7753e08c70b8b0cd SHA512 a86cf3607c903fcc1ce55ab441ddc138653d40eb196e175d211998e11bc850427789d00ad466a3d2ddf990e9a61876938914499992b5a1b56595e7b220a8a31d
diff --git a/net-analyzer/ibmonitor/ibmonitor-1.4-r1.ebuild b/net-analyzer/ibmonitor/ibmonitor-1.4-r1.ebuild
new file mode 100644
index 000000000000..d40390197c37
--- /dev/null
+++ b/net-analyzer/ibmonitor/ibmonitor-1.4-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Interactive bandwidth monitor"
+HOMEPAGE="http://ibmonitor.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="dev-perl/TermReadKey"
+S=${WORKDIR}/${PN}
+
+src_install() {
+	dobin ibmonitor
+	dodoc AUTHORS ChangeLog README TODO
+}
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 8fdeb2b77090..0b7aafb1f981 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -6,5 +6,5 @@ DIST icinga2-2.11.2.tar.gz 7476465 BLAKE2B b3c1ebd220dc21feffa998311d743b004c83e
 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 4734 BLAKE2B ec7ea399c1441b75b3690f6883488ee3a2c3dbb307055bafa4e0b6c12985316cd74a2d6f308c43bbec890e3bb741163c5c793ab7cba4092ec3dfe6e6831e9a5b SHA512 84e71c9437ff19065eef5f4e56817185af748ee896a2b2c8af8201df172cce26d5f4fc3c022644b9a8c063675c7a6407287f4094579309f9101f04a9b47a9d98
+EBUILD icinga2-9999.ebuild 4750 BLAKE2B 4595a0f48310eecc9c20b579634e9bf8a33660aae2aec1e13befb4c58a3d78a1cdd1555fe71e44ec9a39eac3db87a933c215acd83857e132c0e961bfda21ffae SHA512 858f889623bdec040645878b8d95aadbfb9883e9490c792041eb7489223cd098a45c8c1f830cfb086c3b4bde3c9171bcbe1003c1407deb7f4d31ea966f5d6f8e
 MISC metadata.xml 834 BLAKE2B 49da117c90fdfa30311744b471933f1de2d106b74704e4daef5c33fa71f7aa99c6f05d5ca1345baf607b8e18f4036a9582f95487587f50bff90d6ac2d6c1ad48 SHA512 2e28e73e56153235ce7a69ee3f320cd6a8b9117ed6633deaf1095051d75c2c2fb499ff3748fa74262e84b340082dd6c6f08489549486d2dcba6b944d4cf460f5
diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index 31e997e9e6a5..39558b4834ec 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild
@@ -70,6 +70,7 @@ src_configure() {
 		-DICINGA2_USER=icinga
 		-DICINGA2_GROUP=icingacmd
 		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DICINGA2_RUNDIR=/run
 		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
 		-DUSE_SYSTEMD=$(usex systemd ON OFF)
 		-DLOGROTATE_HAS_SU=ON
@@ -135,7 +136,7 @@ src_install() {
 	keepdir /var/lib/icinga2/api/log
 	keepdir /var/spool/icinga2/perfdata
 
-	rm -r "${D}/var/run" || die "failed to remove /var/run"
+	rm -r "${D}/run" || die "failed to remove /run"
 	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
 
 	fowners root:icinga /etc/icinga2
diff --git a/net-analyzer/ifmetric/Manifest b/net-analyzer/ifmetric/Manifest
index f320cd2c4cc2..c64b099a5d98 100644
--- a/net-analyzer/ifmetric/Manifest
+++ b/net-analyzer/ifmetric/Manifest
@@ -1,5 +1,5 @@
 AUX ifmetric-0.3-replybuf.patch 300 BLAKE2B f064a42b38c18e1d3ac5813cc150f14b9bf52a12ceacfa4a02b5619dfa882cda1481f7475831b0e490f253b223201c5dfc8378184545cf3cc6c7d5756af6db42 SHA512 9f7695db98234418b3479bee84f04d27dbcc054d96c5f1689a0e321fca25df970113a62a8922a796a333adab769665ab962573cfa9e49b6f999d74918c27900b
 AUX ifmetric-0.3-ul.patch 515 BLAKE2B cf6fb13d0ac5d07374b932dbcb5dcdb1219d0ef46581f4c788566b6eb971b3baf41eff8c06a774c1d436f08e379f3806e3de848b8dfe25957ff7b74678eb9397 SHA512 1129d0131dcdf33e01c624ec40349be024f27ecab0bcba184325bac3f8be3023e8a0cbcaaf999080277df050af0f7c4953505573a9054b7b3eb29161bc506847
 DIST ifmetric-0.3.tar.gz 81502 BLAKE2B f918932edb730e50ee3598eaeaadd036ca970234c955f05d45ba44c719b650c222adf0e6f971ed6c3387900ee019e092d7e313f0da57afcc6cd63ef842c644c9 SHA512 301d6bc1c97a59597fe55d81a04c1b654aee24d12ac10201ab56cf23b5164808270f15c142cc49142787db70b400cc18b96561aefcf212111ba47df28f07aa95
-EBUILD ifmetric-0.3-r2.ebuild 610 BLAKE2B c922546d864acb55a87f80dcd64fabced0ed85906d07c86a10ab4cd249a507701e7212ca20d30a1cc957fa2cb5fbded4edd041d672675bdb4c5f6ed99962679f SHA512 429a3c19b607c9163cfb5252ff84631f8e6465d3a5bd90065eb47770eb14b950efbd464c9f9f1cc2ca428879bf55744381cb48e316f7fd49c4e1192c8151187d
+EBUILD ifmetric-0.3-r2.ebuild 644 BLAKE2B 4079dce0a6c2fb82433b1dad2bf3f2845d84d490476771054dfa405527c5ea8c426d8a8eb42dcd0995a42a80bc3faa6afa90b0095278ec7ec7eb95ae2662ea68 SHA512 0e2cd434a7433c184c81b7e0e77c7580f078c6a60cddf937864f1a64bd0b78d850644a7e051bf563c459d2861b9fd8ff0c325d27e5b59e6a927e5a86674dae9a
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/net-analyzer/ifmetric/ifmetric-0.3-r2.ebuild b/net-analyzer/ifmetric/ifmetric-0.3-r2.ebuild
index ade8bba29931..8feebe431422 100644
--- a/net-analyzer/ifmetric/ifmetric-0.3-r2.ebuild
+++ b/net-analyzer/ifmetric/ifmetric-0.3-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Set metrics of all IPv4 routes attached to a given network interface at once"
 HOMEPAGE="http://0pointer.de/lennart/projects/ifmetric/"
-SRC_URI="${HOMEPAGE}${P}.tar.gz"
+SRC_URI="http://0pointer.de/lennart/projects/ifmetric/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/ipband/Manifest b/net-analyzer/ipband/Manifest
index 29956e474d63..3a096ab38768 100644
--- a/net-analyzer/ipband/Manifest
+++ b/net-analyzer/ipband/Manifest
@@ -3,4 +3,5 @@ AUX ipband-0.8.1-postfix.patch 447 BLAKE2B 4c9f9b89b401e3530be636b87c9ece2fe80b6
 AUX ipband-init 449 BLAKE2B 5307c6e1aa5c0d1165737a3ad2c01eeb3ef338ac30ef8496973cc5c1d340b0e805093bf357ebd84c7970aa9f6b36cc048fed1911809b69e06e18466c65d4470b SHA512 0a95f80bbfcc26c089a196ba359812a3292e08f378e94140605d2e4d378c60528af013738268055028c40d45b769317f6f631f1af9330f983172c92180999467
 DIST ipband-0.8.1.tgz 36675 BLAKE2B ab0bab6a455fd7fc8193be8b94d7de6c8a781cf3ad7b3a79866deb5fddff834dd5e752163e55007d34c0852fc8ba7ff5b20095b9d5d62bb0db7ca62c72c83b72 SHA512 66347652fee7c7426620260ae615de2f4cfeedacac21d606643e4ae8da204cc81780bfd3f4062a16a9172a78a4a7799fc97e0141750ed26b0e21c8ac2eab3c4f
 EBUILD ipband-0.8.1-r1.ebuild 735 BLAKE2B af55a858f1663175871afb4fc64bc16e87403c2208d1769c5e50b4991f6f8f6cfe76a9a6ed62bf5956cc87283f9a48993d1612eff33226d2233f278ab5388f44 SHA512 6439330ff316aea465e36cc46aaa7b975fe1d80be4c48cab259b907f2cf442338b3f7507b4d08b3cbf045b6c9f148918719ada77edbc9d8d898dcf1944c19e55
+EBUILD ipband-0.8.1-r2.ebuild 688 BLAKE2B 5ad5bb6ac1f1ff1762b1674840d7c4a96582f3d794cfc80483746db5e2ac3b876b2c66d76922c71e9f19dfd055bd4477f742e9d6bd61931473ec25bf6016a691 SHA512 b6ea6049a91f24400e2403e4fe32dfcd884f48ca04d431c891ed8e9768406287321645c17fd72ab6f99eeae7daee9e816cd0647c93a5574c0a98fe12328c5209
 MISC metadata.xml 356 BLAKE2B 2a7264932ec2f44d0f36309d4c4cdcac45257f4d5fd6d61a6feda0f8ba2be066ef497b4021dc27f7802271d1ed3d7bba0e8a41d44a123c5eac7f6f6a6004b804 SHA512 6c8c90ab34232d8be24772a9dca38941823d65270cff167a9ac3eff89c00d447e881fa2dade1201dccece369a7c6e52fb265ff15e33799c8fccfe3adf2c56399
diff --git a/net-analyzer/ipband/ipband-0.8.1-r2.ebuild b/net-analyzer/ipband/ipband-0.8.1-r2.ebuild
new file mode 100644
index 000000000000..6d65e278291e
--- /dev/null
+++ b/net-analyzer/ipband/ipband-0.8.1-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="A pcap based IP traffic and bandwidth monitor"
+HOMEPAGE="http://ipband.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	>=net-libs/libpcap-0.4
+"
+RDEPEND="
+	${DEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-postfix.patch
+)
+
+src_configure() {
+	tc-export CC
+	default
+}
+
+src_install() {
+	dobin ipband
+	doman ipband.8
+	dodoc CHANGELOG README
+
+	newinitd "${FILESDIR}"/ipband-init ipband
+
+	insinto /etc/
+	newins ipband.sample.conf ipband.conf
+}
diff --git a/net-analyzer/ipguard/Manifest b/net-analyzer/ipguard/Manifest
index c98169c6e9f0..c7ce69bbefd1 100644
--- a/net-analyzer/ipguard/Manifest
+++ b/net-analyzer/ipguard/Manifest
@@ -1,4 +1,4 @@
 AUX ipguard.confd 186 BLAKE2B cd3e58efb088134c2ff340360be06ab0f9159b14c766b159dcb546d0136ccd65807b7c33bb89d45565179ead01d43f8da29bfdb19dfe59ba5e0008dc81dc2e82 SHA512 efb47689d944ce77863b7cd1722bba974fbf573af2e1051c08166a535dd8284f2cc820a624531d1c60e099e6da06d59f3659ab52b4b3557f3e1f4bf5c572f58d
 DIST ipguard-1.04.tar.gz 24566 BLAKE2B c9d543e6f7886c3b6377fbfe95e91e2d786da6a92fe445c9500c8b7ea6fb859bf8550daf9c83de425494376d0ed7197158e5ff9499a97417793b439e82004326 SHA512 c29c3f594e09ad1c06ca7297f794ddfada48da7ec2b98786694cd6af7508cbff232889e0c90718d96519297870b93132b7b0f9f310a0e4d7a7c2d54a30ca893c
-EBUILD ipguard-1.04.ebuild 1146 BLAKE2B fba8463110181af4efb83cd6f0026e8ad470eaaf8e8187d451b3c1d331f68f0c7782259342aa7fc50ffd4e5cbc625e2c98d49c5e19249c742a129b77cec6a908 SHA512 5ed15737b5b9039c5ef510c60e38a657ecbfb3b02e148a673a8c879f40178484f3779285d31d4138fb01116f69435df1a02ec42cf57b14406035bb70422658b6
+EBUILD ipguard-1.04-r1.ebuild 1236 BLAKE2B 534eb12f57b29e922d67c27cb1c470f03c9a5cd9eab2eb4e0788fbb0327e700e7fe3cf77f2d5eccdf55474e2acddb0f866b2c0666a6cfb3b60e4adaa2d12b416 SHA512 e860a8c4ee4893cc380ba3e1d12d760661f4bf50229fb43a4f0ffff1dc93f88ecdb7aa858c9f15133019b69797235a089bec713cb0b74e514d625b0ea88a6c11
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/ipguard/ipguard-1.04.ebuild b/net-analyzer/ipguard/ipguard-1.04-r1.ebuild
index 0de7e748f4a2..a30baf79b5e9 100644
--- a/net-analyzer/ipguard/ipguard-1.04.ebuild
+++ b/net-analyzer/ipguard/ipguard-1.04-r1.ebuild
@@ -1,24 +1,28 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="Tool designed to protect LAN IP adress space by ARP spoofing"
 HOMEPAGE="http://ipguard.deep.perm.ru/"
-SRC_URI="${HOMEPAGE}files/${P}.tar.gz"
+SRC_URI="http://ipguard.deep.perm.ru/files/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="
-	net-libs/libnet
+	net-libs/libnet:1.1
 	net-libs/libpcap
 "
-RDEPEND="${DEPEND}"
+RDEPEND="
+	${DEPEND}
+"
 
 src_prepare() {
+	default
+
 	sed -i \
 		-e 's|-g ||g' \
 		-e 's|	@$(CC)|	$(CC)|g' \
@@ -38,11 +42,19 @@ src_prepare() {
 }
 
 src_compile() {
-	emake LIBNET_CONFIG=libnet-config CC=$(tc-getCC) PREFIX=\"${EPREFIX:-/usr}\"
+	emake \
+		CC=$(tc-getCC) \
+		LIBNET_CONFIG="$(tc-getPKG_CONFIG) libnet" \
+		PREFIX=\"${EPREFIX:-/usr}\"
 }
 
 src_install() {
-	emake LIBNET_CONFIG=libnet-config DESTDIR="${D}" PREFIX=\"${EPREFIX:-/usr}\" install
+	emake \
+		DESTDIR="${D}" \
+		LIBNET_CONFIG="$(tc-getPKG_CONFIG) libnet" \
+		PREFIX=\"${EPREFIX:-/usr}\" \
+		install
+
 	newinitd doc/${PN}.gentoo ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
 	dodoc doc/{NEWS,README*,ethers.sample}
diff --git a/net-analyzer/ipsumdump/Manifest b/net-analyzer/ipsumdump/Manifest
index d1824600f258..d84f9ab29195 100644
--- a/net-analyzer/ipsumdump/Manifest
+++ b/net-analyzer/ipsumdump/Manifest
@@ -2,6 +2,6 @@ AUX ipsumdump-1.86-SIOCGSTAMP.patch 228 BLAKE2B 05abaaba5619f0eac3d0dda66ad948af
 DIST ipsumdump-1.85.tar.gz 919540 BLAKE2B 870e003f4d9149904e6a411ae89b6df3e6f90e378b300dea823701e5f168d7f7b2c788702c3ca9c5840dbbe4372e30435e6fab79fd975328ddc474bc3e797559 SHA512 b42844cf028b9c1ea9da90306be8d731bffcec1a8f5c9eeb8029f563ddd5781651c583913a2105d8ad99cabac4b003345e1e8fdfb83367cabf806de1bca31596
 DIST ipsumdump-1.86.tar.gz 895567 BLAKE2B 5d33e2c6a5df836592028fb1026749561188b3e0cc15fe691404ad17bc1dd724f4fd9e1be46bbe76b200288575251178f874df4f8697b0e943de4185b71f9e69 SHA512 38bf55589ab81eb7601283410a9f962508e419c1a0ef24f088a2d1328b29e360a9788a20689ea45724fbc56194ecb5ede1f3b792e5bc7e97a500a7b2e434fe65
 EBUILD ipsumdump-1.85.ebuild 566 BLAKE2B 21324b6effeee5a7d4c148aac10c127c50e69a4c1a79f613b73dc44e7578eb137e297fa6dc7ebd1c00f74f1f088330a07be3be0a17ece27acff7edab367b13b1 SHA512 7bdd99fc11e9384a6ccadd786b71e142ef8890bd9b4082f254b56a62797761ec4e26a70b0a9193ca882f95eec91a157a62fcd5f3d539aa54a86b53fa4e51460d
-EBUILD ipsumdump-1.86-r1.ebuild 641 BLAKE2B af657021aeed8a2752c2efc8119252636537deee7b8ce44024549120159ee3bbada4e5add37f82a2ccc57d6331801a1838ebe635f11b810e49e5024cf8a55772 SHA512 9e9361a75e7459cd16c77af2d35b1cd5a42ae1af0cdfb17a55cdff018eb4c9bd60be5746f70514b2282feacb41bb7328b1db4a980dec8c05413a3261e131fddf
-EBUILD ipsumdump-1.86.ebuild 586 BLAKE2B 5a7328c107e4c8356532f9257ea1af8ba5a4bdbfa9bb8daaff9cdedb7220b658d3dced093d0b0331ac46107d05d93f0f693a2c7b878b295e17b1eb10edc16d09 SHA512 21143b4e07e5d42aac54ebee738af1af6a29c6a2cb279f9d5f3207dd859692cb970a21e37c0b90271488d6813d64c6dfe0582444b6caf088016c6c9ab721582c
+EBUILD ipsumdump-1.86-r1.ebuild 677 BLAKE2B ecfbee5620294cc0a2a3d61397f57058e5dfcda42df68636c3900a80613c242b8415ac4142a07e7d9095c3338a9dafdef60721a5e03d144f68aab1eb9b0bff38 SHA512 5ac16968e5c43fb1e8109bd34c0dc35990ab8f1946541531e396577b50ab84aee161c6171c7880fc8a192940d44a3e42456ddb1290a26610b394ac438a4ecc06
+EBUILD ipsumdump-1.86.ebuild 622 BLAKE2B 8d4e9e18c3f1c2f53923a67e0dc88c410f5d94afb6f52620972ac0265d05a7d1305dc150910bf7a45cddfcf478323c6ccb12ceb97aacb66c6daf79901e638fd0 SHA512 2f2cded84a7bd6975ba697488e76d14cbb5b36abed226644bc179cc7c607de577aa678d6a27ad0f305aa8a2d259a2a6bff11401f6e5da0645b1e5d2ba98adf88
 MISC metadata.xml 563 BLAKE2B 1c76f973fe5a6165461b1822b83462cc49c658ce95d020e38a3f5eb4fd8ae3e5e5a455491ca4e9da2089f439757cd21ec9788c5ce1f845421a3a030255f7bdb4 SHA512 1867ca535fabb5e70808491cea9339e91e21009f30526dccbbf29594bba57261d98a10b43d096f24b84d476a4dedfd9be1ca7fbbc3445ddde928580789914432
diff --git a/net-analyzer/ipsumdump/ipsumdump-1.86-r1.ebuild b/net-analyzer/ipsumdump/ipsumdump-1.86-r1.ebuild
index 25325a3484db..2dab97c5d4c0 100644
--- a/net-analyzer/ipsumdump/ipsumdump-1.86-r1.ebuild
+++ b/net-analyzer/ipsumdump/ipsumdump-1.86-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Simple TCP/IP Dump summarizer/analyzer"
 HOMEPAGE="http://read.seas.harvard.edu/~kohler/ipsumdump/"
-SRC_URI="${HOMEPAGE}${P}.tar.gz"
+SRC_URI="http://read.seas.harvard.edu/~kohler/ipsumdump/${P}.tar.gz"
 
 LICENSE="the-Click-license"
 SLOT="0"
diff --git a/net-analyzer/ipsumdump/ipsumdump-1.86.ebuild b/net-analyzer/ipsumdump/ipsumdump-1.86.ebuild
index 784df50ece56..c4394aa97cc3 100644
--- a/net-analyzer/ipsumdump/ipsumdump-1.86.ebuild
+++ b/net-analyzer/ipsumdump/ipsumdump-1.86.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Simple TCP/IP Dump summarizer/analyzer"
 HOMEPAGE="http://read.seas.harvard.edu/~kohler/ipsumdump/"
-SRC_URI="${HOMEPAGE}${P}.tar.gz"
+SRC_URI="http://read.seas.harvard.edu/~kohler/ipsumdump/${P}.tar.gz"
 
 LICENSE="the-Click-license"
 SLOT="0"
diff --git a/net-analyzer/ipv6toolkit/Manifest b/net-analyzer/ipv6toolkit/Manifest
index ba23fc688cb5..f66a4be17ed3 100644
--- a/net-analyzer/ipv6toolkit/Manifest
+++ b/net-analyzer/ipv6toolkit/Manifest
@@ -1,3 +1,6 @@
 DIST ipv6toolkit-2.0_p20160422.tar.gz 796716 BLAKE2B 468375afbf385ac9b571708be1baff0b0c56a0895bb73f3711522120b0e5fdfded3d73fea2a7d48b38f1e6387e0d63674c08eb503281f6eb635ea131ae67ec47 SHA512 532d6b76159fca03bdcebe341540a4071d2381dd3046469d0dfa5e8eecda5ffb4182d40658ef14c67bd11b781773bff1192e96d0ac4210c5ca095c6475d6c26d
+DIST ipv6toolkit-2.1_p20190919.tar.gz 979235 BLAKE2B 1b652b00874b9a71a5e5b86643d9c71fc02917af93d9730e7e4be7e5203d07dfef5bc7d1bb0453a6bf9dece69f7f4256912f0902132dd21530ae8ea9e94b8b4f SHA512 78e7565f4827d21573ced06002311a4f3736df71846085b3e8e47e0d6aebeaa4e60881c148c3c65ee010ffcfb2bf3ad56bb2625203aff5b0fdf40fbb7f37ecb9
 EBUILD ipv6toolkit-2.0_p20160422.ebuild 1245 BLAKE2B e108d57bf264bc9b0d1f42e83b638354520832267bfa6c700dd7630e163e5da3aeebe332be7786c21cb86dcbd216e579ed669d402373135440d98ea0fdabe014 SHA512 f3c18c571a6c341697135c3cb1b355bed43bc79a61bdf048c112819e312658b260b8afca432e046fa391a16af8e97d36644daf77dd11d236d3b70ae263d88ea7
+EBUILD ipv6toolkit-2.1_p20190919.ebuild 1158 BLAKE2B be8f899af0570e84204eb8f72cc4199f9d486b9ffe10d1a98496463577fe6d62b69add5e4e07fa93a5193f396cb7f772d2ce04f6759faebdae1fe6f9625127ae SHA512 29b9e9fbc19dd1f9400bf5fa4e350c5859ca1b650410f8f57a92898d3d933a67cec8af2e1d25fea1e44b09d091cc091e8705cf1ea91b26ba9d8c00ef88c58cfd
+EBUILD ipv6toolkit-99999999.ebuild 1029 BLAKE2B da79779c2bb84b817aa197e86931e8fdc8a14597916a867bd01cc211b770425e485bfb19f28345a85a62b60e8bea8f5c2065c26b5e89699d67e306f5746d2a3c SHA512 376b1b2b881e0285f084b8edad8f4aefc83683d3f4c947e3ca4ada0518bc9291ed8f09bc3bbd275e27f32532857ef33ae2006277c6341adf800a5471274d39c1
 MISC metadata.xml 527 BLAKE2B e275ef7193981f8415d0aa0973743deb8b4b0302fb093a26254dd0e681e072e175466869335c909c2f39ecc241f2de1e1a8135b0f6f59f17a566fcd5d9065e51 SHA512 acec773e132e352f4f81af6840f3370da00f48e5e13f39a2fccc441e5d119c5fac4319b24745eef1b4fb0921e8ace7456f7230432fd86978bb27cc54b7de3ec4
diff --git a/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20190919.ebuild b/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20190919.ebuild
new file mode 100644
index 000000000000..6a4df21782ca
--- /dev/null
+++ b/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20190919.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Set of IPv6 security/trouble-shooting tools to send arbitrary IPv6-based packets"
+HOMEPAGE="https://www.si6networks.com/tools/ipv6toolkit/"
+SNAPSHOT="20de5f297f73b6a8115d1eac52adfe0b6df5b3ed"
+SRC_URI="https://github.com/fgont/ipv6toolkit/archive/${SNAPSHOT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/"${PN}"-"${SNAPSHOT}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	net-libs/libpcap[ipv6(+)]
+"
+RDEPEND="
+	${DEPEND}
+	sys-apps/hwids
+"
+
+HWIDS_OUI_PATH=/usr/share/misc/oui.txt
+
+src_prepare() {
+	default
+	sed -i "s#/usr/share/ipv6toolkit/oui.txt#${HWIDS_OUI_PATH}#" \
+		manuals/ipv6toolkit.conf.5
+}
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PREFIX=/usr
+}
+
+src_install() {
+	dodir /etc
+	emake install DESTDIR="${ED}" PREFIX=/usr
+	#remove the included oui file
+	rm -f "${D}"/usr/share/ipv6toolkit/oui.txt
+	#fix the conf file to use the one from sys-apps/hwids
+	sed -i "s#/usr/share/ipv6toolkit/oui.txt#${HWIDS_OUI_PATH}#" \
+		"${ED}"/etc/ipv6toolkit.conf
+	dodoc CHANGES.TXT README.TXT
+}
diff --git a/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild b/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild
new file mode 100644
index 000000000000..8a862e677183
--- /dev/null
+++ b/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit git-r3 toolchain-funcs
+
+DESCRIPTION="Set of IPv6 security/trouble-shooting tools to send arbitrary IPv6-based packets"
+HOMEPAGE="https://www.si6networks.com/tools/ipv6toolkit/"
+EGIT_REPO_URI="https://github.com/fgont/ipv6toolkit"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+
+DEPEND="
+	net-libs/libpcap[ipv6(+)]
+"
+RDEPEND="
+	${DEPEND}
+	sys-apps/hwids
+"
+
+HWIDS_OUI_PATH=/usr/share/misc/oui.txt
+
+src_prepare() {
+	default
+	sed -i "s#/usr/share/ipv6toolkit/oui.txt#${HWIDS_OUI_PATH}#" \
+		manuals/ipv6toolkit.conf.5
+}
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PREFIX=/usr
+}
+
+src_install() {
+	dodir /etc
+	emake install DESTDIR="${ED}" PREFIX=/usr
+	#remove the included oui file
+	rm -f "${D}"/usr/share/ipv6toolkit/oui.txt
+	#fix the conf file to use the one from sys-apps/hwids
+	sed -i "s#/usr/share/ipv6toolkit/oui.txt#${HWIDS_OUI_PATH}#" \
+		"${ED}"/etc/ipv6toolkit.conf
+	dodoc CHANGES.TXT README.TXT
+}
diff --git a/net-analyzer/masscan/Manifest b/net-analyzer/masscan/Manifest
index a776d81f8f11..c792415c586a 100644
--- a/net-analyzer/masscan/Manifest
+++ b/net-analyzer/masscan/Manifest
@@ -1,6 +1,6 @@
 AUX masscan.conf 174 BLAKE2B 03a04c87f99de4c98ef2635111f61dc8c5f41c0b91e224786ead69aaa40c295fea46e63083c8e24e589158c4a8726c20aea2105fb674d06ae10c68c01ce345b1 SHA512 dee80bdeac6755a7edd24a12b25fc071e45680a8849eeb60193ad1089262989aeb7b44f75b0de34e6b07dac1ceecb759f1776e27bec2bfcd13b077baad0ebb77
 DIST masscan-1.0.4.tar.gz 343513 BLAKE2B e50789c8a2246c4109990e93c9c53cf68b2b555955f675e1a9acd4074c2b85773aba58f3644db1f98a88c4cff85cff5a9035f2fbc56978103458dc34e6dc353a SHA512 eb82d8ad4d6a5c77cf79197e18470a68f7c361f0785180d631e9625578e90af6ffdaa45b728349da5a1cb945a8f902541b8f708be8a4075737ccb06e948d6e2b
 DIST masscan-1.0.5.tar.gz 353901 BLAKE2B 83145955b42f660788fdd7687b0a88ad84d6f31a4f99fc1fe4691f266f3c3492882334d9f0b4acf3c31d33950daedda56b6623cd3ba6ef9a27914613f09d485b SHA512 55d58234994ebea10bcb3f45a24cdb51b020350faa116aee3a48861a119f66c339d1f533c978f52e37ccf5266be6fd2802765f13461d94eb28ec8d18c68e2f88
-EBUILD masscan-1.0.4.ebuild 802 BLAKE2B ca40492b8bd1cd457a6bff9cf36fa8d4dca1506159c2356901e076b2008c3a6beb9489a6deaf4d557a48bdb968db0c0b8a90d821a021131cf9851046b18dedf0 SHA512 009a6801721979fef9d79101bd9f3badd492c386d4abbef0b2b7a861de23685ceecb885feb0c1ba1cfc06ee9a53e86c293c893445164b72d600734f7c0a834d6
-EBUILD masscan-1.0.5.ebuild 790 BLAKE2B c16f2071b9997fd7f7cc384f4c495190fde59ec90fc8fccf528b7bf749eed1fcfc7ae01c2c0646eadebc19a0c839480d6a714ef9f4bf22c6063adc3c335827cd SHA512 c0f1e61cbc4795d39058125170fabeb0e08a2ef089c56157bf7175b4fa67d51836a55e49b2f8a4229fc97e973015402151b041ececb8139f63ecab90b7c2478a
+EBUILD masscan-1.0.4.ebuild 835 BLAKE2B a9975683a1fe1760bc7a0bd477a44c8522c732c4c15a57f7811b3d52be11be89cc2aeec3f1246e8282dabb133c9c123f09d04e1f0d5cafedd1df8a12b8d0223e SHA512 fff7d5d615b491830a99bcb214cf4fbaf4c965d3d436dc4f0223d17958942f76bf6a6175d654f553deff79559b7831001f134d55d309b553f12267e7161de28b
+EBUILD masscan-1.0.5.ebuild 823 BLAKE2B 5ec215ad5e0bd01004d7bb1e5bc077bf018d7c23c4ee0fcb618decc1419596a379a045d2ebf7305cf1069b11e76cacb3ee12aca36353394f8545307a103d7d9f SHA512 b59615c5dbb5aeea9082df7666d0084d4546b621f891d49ae876153fda170b8f8110f1a8ec6e99e1db249f8c0686da2b0144ba051b064833bf9af65ed040807f
 MISC metadata.xml 975 BLAKE2B 6867f941d5c26ae55542c5ae8e7c75b5d6ff4995dde7757d9666b50659028a8a86706fb2f551778603141ae8b063a7395ce27aaec035eba06adad1fe9a37fa3d SHA512 454748e7c1338b149c4273ac52361a671eece56eff745f07ab6b966689737fd6ffc1b901c3a5844f1fd584fdd78016c6bfd63e9957f9eb8b2463c352165df782
diff --git a/net-analyzer/masscan/masscan-1.0.4.ebuild b/net-analyzer/masscan/masscan-1.0.4.ebuild
index 66006b6476c1..b7e96fc03253 100644
--- a/net-analyzer/masscan/masscan-1.0.4.ebuild
+++ b/net-analyzer/masscan/masscan-1.0.4.ebuild
@@ -6,7 +6,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="Mass IP port scanner"
 HOMEPAGE="https://github.com/robertdavidgraham/masscan"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/robertdavidgraham/masscan/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="AGPL-3"
diff --git a/net-analyzer/masscan/masscan-1.0.5.ebuild b/net-analyzer/masscan/masscan-1.0.5.ebuild
index b8f0e1839d5c..de70ec9cb3cc 100644
--- a/net-analyzer/masscan/masscan-1.0.5.ebuild
+++ b/net-analyzer/masscan/masscan-1.0.5.ebuild
@@ -6,7 +6,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="Mass IP port scanner"
 HOMEPAGE="https://github.com/robertdavidgraham/masscan"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/robertdavidgraham/masscan/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="AGPL-3"
diff --git a/net-analyzer/mk-livestatus/Manifest b/net-analyzer/mk-livestatus/Manifest
index 789b00d77409..d2f922c2e752 100644
--- a/net-analyzer/mk-livestatus/Manifest
+++ b/net-analyzer/mk-livestatus/Manifest
@@ -1,9 +1,12 @@
 AUX 1.2.8_p10-MEDIUM-Drop-default-strip.patch 812 BLAKE2B f02aee31116dede718ef3671fe86b228ce3031f01fad987ed8622e7e434747e07fc535798f9c5122125f951257a7446f76fc42f7b1f063cc1b5897eeca0cfbf2 SHA512 6fc48bbda7b235e50fb7cfa1298b9c7a2c6730e14639371a811febf84c2f7ed30d43cef6e54c794c50dc2e78fba5ead8a3a5c852bc1d605d5d202c92527242cf
 AUX 1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch 1111 BLAKE2B fb036de5371602ad2ef36ad4916d2f6193a8e8fef4ea2adebe1ace6225ae9c76ffc3ec72ec6649b3ed45e423e3cf6351f86d82d0f524c1a6842066f1e43be99e SHA512 162daa81e2122dfd806e3227b3d22775fa3c36d97e92ce638328e46b99d54d2ff9c1ee51b525677a48a40c180ee0cac2c5c8fbcf50bebdb2f6a18ff836310404
+AUX mk-livestatus-1.5.0_p22-rm.patch 306 BLAKE2B ac45ad1c89a8a067cf780ae13d24a50e4a983c619846ee1e6dcc5a56e3fe8d541b82b8a3f14e7b32f934acefdaa8890635e1745a6e7f17e04f46dd603e461803 SHA512 b172fbd35f7d9b06017bf9df56f8c8ec106f1d71e77dbf6a6a55d974dcf4ccf3548379164c7b4fdac8c1b28456268433d061049c0d2781d9cf3434682e32ebb7
 DIST mk-livestatus-1.2.8p10.tar.gz 453496 BLAKE2B 5c6cb41dff2d3cc29837088c18c6f7e4bfa6a5a9a3802adafe86fb28523bfc8037fc0c69770861612568db5fc8b61569663c3033201c6293b6da2dba3de55100 SHA512 ff25c2a8d0105fdd156bc922b56df10e3497361620671dc73242db0a7b57fbd34955b5f4fbd9954602c8011b1f6a5ebd4e278df7c3e66639d74110fd0035682d
 DIST mk-livestatus-1.2.8p16.tar.gz 453565 BLAKE2B 73b4f2d245740e9427af391691a3873b2930bbef1de2b147cefdde1b84f24e7acf61aa748a8adaad4290c77d9b1c7aef7540c69d44c420522c5d56115127b49b SHA512 32d4bc014c008ac7afbdca53e6b3e0d71f8eee5f41f4a0299a8e14cee2a1ea93216fe04c4ff9aa7d7b927dde8e63d186f09a2847665851f1063e699cf73a8df4
 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.ebuild 3390 BLAKE2B 380082a961401822aa98abc221becf7bc7fae44bf2064e41f4847ee218f746b82bf83b79533e4a6061ad869e79674acd3f1468f11df4fc99c13db60183e9559a SHA512 fe3029d2dc50db99c3be8407befca9023bb83cdcbffdab82fe671cbbc60cb71c17fd32257f752b4f93be8f728f3698a76273d316409dffc9ae314e48141bb156
-MISC metadata.xml 617 BLAKE2B d334e2ab6cf614f4c1a8c5ab0c4d5f14e4b841618548cb1e621cd8adc2f5e9565d4c7b640313841f0bc6f906dd8204939119d5b1e2ab2737fb6355e9f11846d6 SHA512 227a4ec9dad38a0be74140697b5095c694ca6837d1bf6fc396f6de28781eba572164e9c8cf7273a8b7286f2d68e5b8efe2facde4b705901d4d675936ccd9d87e
+EBUILD mk-livestatus-1.5.0_p22-r1.ebuild 3564 BLAKE2B ab61245038fdd308462b21281e73670bcd0ec64a7e18a6afffdcc3df1fc3bbb8d1e93b13967626b8bd5721faa8777df29ecde3a1a75b75dd141746e789cf2a7f SHA512 ab4458b4797ba6171314863018b4020538e85d355197fb760f557ef249bdc2eb66f724d727fe1bb9e482bba5dbe7eb9785a319d3ba2bc342722cf46aafb798d6
+MISC metadata.xml 764 BLAKE2B 6cdc02ae09a5f2ee8264648a31feaddce015eaa21824d2466462dc359ca4b9eff656d6714e6e7bed8b6312d10a8e89712287417fee55cd8bf1707f5837849298 SHA512 a113631d9036af5c65ecd6ab393ecd14af3c05511f8c99adac6106a7f54ec172c2bd86eaa5289021baebdb65c62d1f26e72a13ae47aab8245e4e4da8f19142e2
diff --git a/net-analyzer/mk-livestatus/files/mk-livestatus-1.5.0_p22-rm.patch b/net-analyzer/mk-livestatus/files/mk-livestatus-1.5.0_p22-rm.patch
new file mode 100644
index 000000000000..5c267ae2f4cd
--- /dev/null
+++ b/net-analyzer/mk-livestatus/files/mk-livestatus-1.5.0_p22-rm.patch
@@ -0,0 +1,10 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -201,7 +201,6 @@
+ install-data-local:
+ 	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
+ 	$(INSTALL_PROGRAM) livestatus.o $(DESTDIR)$(pkglibdir)
+-	rm -f $(DESTDIR)$(pkglibdir)/liblivestatus.a
+ 
+ clean-local:
+ 	rm -rf *~ compile_commands.json cppcheck-result.xml html
diff --git a/net-analyzer/mk-livestatus/metadata.xml b/net-analyzer/mk-livestatus/metadata.xml
index 29e9ad4c81c5..4a90a3fdc4d8 100644
--- a/net-analyzer/mk-livestatus/metadata.xml
+++ b/net-analyzer/mk-livestatus/metadata.xml
@@ -15,5 +15,7 @@
 	</maintainer>
 	<use>
 		<flag name="nagios4">Generate a <pkg>net-analyzer/nagios</pkg>-4 compatible plugin</flag>
+		<flag name="boost">Use <pkg>dev-libs/boost</pkg> for ASIO support</flag>
+		<flag name="re2">Use <pkg>dev-libs/re2</pkg> for regex support</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.5.0_p22-r1.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.5.0_p22-r1.ebuild
new file mode 100644
index 000000000000..658d951078ac
--- /dev/null
+++ b/net-analyzer/mk-livestatus/mk-livestatus-1.5.0_p22-r1.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python2_7 )
+inherit autotools perl-module python-single-r1 toolchain-funcs
+
+DESCRIPTION="Nagios/Icinga event broker that allows quick/direct access to your status data"
+HOMEPAGE="https://checkmk.com/"
+SRC_URI="https://checkmk.com/support/${PV/_}/${P/_}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="boost examples nagios4 perl python re2 test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	!sys-apps/ucspi-unix:0
+	net-analyzer/rrdtool:=
+	boost? ( dev-libs/boost )
+	perl? (
+		dev-lang/perl:0
+		virtual/perl-Digest-MD5:0
+		virtual/perl-Scalar-List-Utils:0
+		>=virtual/perl-Thread-Queue-2.11:0
+		virtual/perl-Encode:0
+		dev-perl/JSON-XS:0
+	)
+	python? ( ${PYTHON_DEPS} )
+	re2? ( dev-libs/re2:= )
+"
+DEPEND="
+	${RDEPEND}
+	perl? (
+		dev-perl/Module-Install:0
+		virtual/perl-ExtUtils-MakeMaker:0
+		virtual/perl-File-Path:0
+		virtual/perl-File-Spec:0
+		virtual/perl-File-Temp:0
+		test? (
+			dev-perl/File-Copy-Recursive:0
+			dev-perl/Test-Pod:0
+			dev-perl/Test-Perl-Critic:0
+			dev-perl/Test-Pod-Coverage:0
+			dev-perl/Perl-Critic:0
+			dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect:0
+			dev-perl/Perl-Critic-Deprecated:0
+			dev-perl/Perl-Critic-Nits:0
+		)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch
+	"${FILESDIR}"/${PN}-1.5.0_p22-rm.patch
+)
+S=${WORKDIR}/${P/_}
+
+src_prepare() {
+	default
+
+	# Use system Module::Install instead, it will be copied to $S by
+	# Module::install itself.
+	rm -rf api/perl/inc || die
+
+	# failing test
+	rm -rf api/perl/t/20-Monitoring-Livestatus-test_socket.t || die
+
+	if use perl; then
+		# Ensure patches are not applied twice
+		unset PATCHES
+		perl-module_src_prepare
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC CXX
+
+	econf \
+		$(use_with boost boost-asio) \
+		$(use_with nagios4) \
+		$(use_with re2)
+
+	if use perl; then
+		cd api/perl || die
+		perl-module_src_configure
+	fi
+}
+
+src_compile() {
+	default
+
+	if use perl; then
+		cd api/perl || die
+		perl-module_src_compile
+	fi
+}
+
+src_test() {
+	if use perl; then
+		cd api/perl || die
+
+		SRC_TEST="parallel"
+		export TEST_AUTHOR="Test Author"
+		perl-module_src_test
+	fi
+}
+
+src_install() {
+	default
+
+	rm "${ED}"/usr/$(get_libdir)/${PN}/liblivestatus.a || die
+
+	# install a config file showing whats needed to enable livestatus for nagios
+	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
+EOF
+	# same for icinga
+	cat <<EOF >"${T}"/icinga.cfg
+define module{
+        module_name             ${PN}
+        module_type             neb
+        path                    /usr/$(get_libdir)/${PN}/livestatus.o
+        args                    /var/lib/icinga/rw/live
+        }
+EOF
+	insinto /usr/share/${PN}
+	doins "${T}"/{nagios,icinga}.cfg
+
+	if use perl; then
+		cd api/perl || die
+		perl-module_src_install
+		cd "${S}"
+
+		if use examples; then
+			docinto /
+			newdoc api/perl/README README.perl
+
+			docinto examples
+			dodoc api/perl/examples/dump.pl
+		fi
+	fi
+
+	if use python; then
+		python_domodule api/python/livestatus.py
+
+		if use examples; then
+			docinto /
+			newdoc api/python/README README.python
+
+			docinto examples
+			dodoc api/python/{example,example_multisite,make_nagvis_map}.py
+		fi
+	fi
+}
+
+pkg_postinst() {
+	elog "Sample configurations for icinga and nagios are available in"
+	elog "/usr/share/${PN}"
+}
diff --git a/net-analyzer/mrtg/Manifest b/net-analyzer/mrtg/Manifest
index f470045473e4..b8f2b4667ab8 100644
--- a/net-analyzer/mrtg/Manifest
+++ b/net-analyzer/mrtg/Manifest
@@ -2,5 +2,5 @@ AUX mrtg-2.17.4-socket6.patch 481 BLAKE2B 2294221471be6b9db0a5676a3f819684b0bdac
 AUX mrtg.confd 402 BLAKE2B 8a06370eeb0b31e435eb93be8e625a8ba151278462576c0f3f600747cef9f043b66c4f5142900f515a12dd1c38a7fe27f04dcdc832d050e980ee08ccb6e7739f SHA512 18066805d2fea3090a3165a15f963310a94b4e4ee5e9fa88617eb246b1a1a4e91e3faabe4f4a2fe2ebd8f7a69acae82f1b51e3830bdab04da64f03d84c2e7e7c
 AUX mrtg.rc 1275 BLAKE2B 180e9070e8648e05ff02b24a642c9e4f1b22d3a952385ab58c70411c1ed2fde4bef3f9ae61b35808049a1451d82822f7bfc2e3c222a3689dabafcd83a49ee00c SHA512 bcf5d95130e2e8ec4df9b3d97e99e2a36e65ed41b23ca8b249e3507e61ac0945945a0576e80efae9efaca9deca4d1a64ead95e05c285fd62fb0ea914864b6d51
 DIST mrtg-2.17.7.tar.gz 1098650 BLAKE2B f8191296fc163b950792b8ecee773cfe643a7390d49444ce8b5012b2dbd932093cb4f71745ba2c86bda579fbcd3c73a4f9cebc1fa4e7f791a7b4461ae92ac191 SHA512 b25ab38416213bc5128612724530f36f4a855bb66a65f8bbe4bdafef05d2688eed68f5c3df1e13193102507a4114e71ec226ad32dd6b4d3ae2e2291320d8e768
-EBUILD mrtg-2.17.7.ebuild 998 BLAKE2B 8d155708937ec160c58afd27b37af9ed1fa6ca24a1b0e9fa07964ab29bfd7b88b2b45e092eef942f00ddec77f0842bb15feca54f2c5b877fd9cd7e50f2f54549 SHA512 2643134ef1268ff75c84ddeb05d58eded63fff25cb9974906124128dc8db9cb2c1b89f7ecb26fb5d741ffaa3307cc9cf190be08a69a44f3f28019539a23085be
+EBUILD mrtg-2.17.7.ebuild 1015 BLAKE2B 89007a52bfda9d30f19218f44a228acf686b7140b1cc19220c3d189ffa80f9dfe17369c59a3c1bf0150235984605054dbe0f00c88e5720836ba459a42b3469d4 SHA512 7997a451c8841a366d8133196c087fab3a3a32e72c77cf8e65d7b2677a229c486d9edf7523a2bf36f9501627f23af1c223625829c1cfa19a82de591df09c5104
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/mrtg/mrtg-2.17.7.ebuild b/net-analyzer/mrtg/mrtg-2.17.7.ebuild
index 6e783cc87aec..6ac3bd8f2fe2 100644
--- a/net-analyzer/mrtg/mrtg-2.17.7.ebuild
+++ b/net-analyzer/mrtg/mrtg-2.17.7.ebuild
@@ -6,7 +6,7 @@ inherit multilib
 
 DESCRIPTION="A tool to monitor the traffic load on network-links"
 HOMEPAGE="https://oss.oetiker.ch/mrtg/"
-SRC_URI="${HOMEPAGE}pub/${P}.tar.gz"
+SRC_URI="https://oss.oetiker.ch/mrtg/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 6a83cc0a5db6..5218a114dc10 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -16,6 +16,6 @@ DIST munin-2.0.49.tar.gz 2257501 BLAKE2B f2852357e3aa0c1ca3e217b66c3e2d1c0d9c70b
 DIST munin-2.0.52-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
 DIST munin-2.0.52.tar.gz 2266820 BLAKE2B 41233cd28ce4d682dfd47895061426404540c6b1c65798609a2d509d39ad5359b22087027662e7c03848e5676815843c34d078b782e3d0ab3a6a29b6a22e058b SHA512 7439ea10006a94227b71328d06411378f6855f23f17815a433b3a1c40ea23da5a25a366d48f911b9cfdc43c4b98f3bb9777b67db2b894441eb8941e84ede379c
 EBUILD munin-2.0.49.ebuild 12302 BLAKE2B f943778e48a625a0fc342ca5cc7d9323092ebbbd4d4fbce281d11d11f0d68425a734290ac2e63b3e221fed2fa6ce9b6a52dc99c4c0ac23c1fbecaaa599ce31f8 SHA512 fe270e67ff999c30c5f88b6b9ef4143de37b2f4e6708dac876ce35f44efd8cab7efec1fa08d49466e091e549020384676b2b6598d3a21f7811cb143fe3e89faf
-EBUILD munin-2.0.52-r1.ebuild 12233 BLAKE2B 668df7a3a19bf86f7980ed95a18da83061a68fb0b642e44ae2f30b838b916bff97cf728583fb6744bd60faed64a8f8debb9bdbc6a08a7d14b21ca6237c188eb5 SHA512 0bc2a4d5b088949801db7b8ba8f53a20a09419800eed751ff9eccb553b67e6075bda828bf2291b595b417f0784943fb8a08325a27d2aa8f5094d3d1c5e496c64
+EBUILD munin-2.0.52-r1.ebuild 12256 BLAKE2B 1c6d426aff660c76e03ab64745e4aaab525291e8a182a98902ed0707a1bd907895d5e6b7e6f14e3063efc631ee377d4374f0897c5b594303c5379b902ee9ef10 SHA512 a055bfaa3d168343afc4fda050b9a99027ec17fe94b673f2cc23ebedc5ffbce9ad9cb2cf149fac16ec55c54d35a32e4a4f37242116fc3e82c4f02c493128c446
 EBUILD munin-2.0.52.ebuild 12392 BLAKE2B 93020da1b15e1c227005120156a44186c8e2c1e1b6d8438af1fdc83c27e6f7a0f2d91624cea3a61f7ea474cdbc9fb0b204027337a50a0a8b0ccd07040901aea4 SHA512 0b5dfd06dd1d6df52cbb088d278bc3d5debf5fd42c70218aa3afd691623f182e51fd4d423099908ba76981c7a5854de4da19f155712b75c1e5745e872e7d4e13
 MISC metadata.xml 3920 BLAKE2B cb28e1a3e95ffcc305975d7edc26a5cf852a2a29f8c56376c9bbc90fd2b2850bfeb614d750e7700870aa0c10c8dcfcd2b845c210a5518f591ccfbb7571971cda SHA512 9d12c61750f5ee42cfcb6672facf3b46a024872d918c7acb26631c1b9bab29802a6ac9f4d895b9f4ef18a6f283ad64d4bd6e313df0489a6ed82185c660c42083
diff --git a/net-analyzer/munin/munin-2.0.52-r1.ebuild b/net-analyzer/munin/munin-2.0.52-r1.ebuild
index 99acb538fe3b..80f46fab8967 100644
--- a/net-analyzer/munin/munin-2.0.52-r1.ebuild
+++ b/net-analyzer/munin/munin-2.0.52-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
@@ -28,6 +28,7 @@ RESTRICT="!test? ( test )"
 # 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
diff --git a/net-analyzer/nagios-check_multiple/Manifest b/net-analyzer/nagios-check_multiple/Manifest
new file mode 100644
index 000000000000..f0e64423ff50
--- /dev/null
+++ b/net-analyzer/nagios-check_multiple/Manifest
@@ -0,0 +1,3 @@
+DIST nagios-check_multiple-0.0.1.tar.gz 9376 BLAKE2B 2db464b7edd4aa704560a3f16a5d70e4cdef7cd35284e3c679f3e10e5ef6eaaba19dc361efbb10a77f87c14726439869e4b415fe7e393a1d7ac23233b3bfa66a SHA512 a75bcd821afc6daca612f42c552fb965a3068dc04a94df41ff41d36928c764d44bcf72e1bd6d776bf4b443c73fc3946c0a91443a562019fcd1b6e8687d0ebcd2
+EBUILD nagios-check_multiple-0.0.1.ebuild 1356 BLAKE2B 2656b3d6558fbbfc33c216e8734ab496d069d59dfb4ceb2b19fbd4fc0bf58a73d1e7ff3d8c896e86aef48eacec653b736c554f9359a4aff4251c79589295417e SHA512 d690763ff2a233ad99209f9df71e3121fa8542cf4692cb48067c2c77341c378767467eafecea994fadccbdd007479d311a9b11a6ae0300349645262abe4f3bac
+MISC metadata.xml 346 BLAKE2B 16270d3fccdcd1c5519beddf3e520377a2538ca793fc1d0c9e3f1e640db66b562971900d5595754104cc30390661c6ff714ac790868e6aeae719e68c72eb2d0d SHA512 7f773b9c98c57e43fb394a2db6bc357d49c4561f44419aff7867fdc07eece455a473309646e90ed065ab11c64576d4dd764d134403330bd83e9f71e680d5a932
diff --git a/net-analyzer/nagios-check_multiple/metadata.xml b/net-analyzer/nagios-check_multiple/metadata.xml
new file mode 100644
index 000000000000..9956f0ad2444
--- /dev/null
+++ b/net-analyzer/nagios-check_multiple/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+    <name>Michael Orlitzky</name>
+  </maintainer>
+    <upstream>
+    <remote-id type="github">clarkbox/check_multiple</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1.ebuild b/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1.ebuild
new file mode 100644
index 000000000000..2ab9a4401b09
--- /dev/null
+++ b/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1
+
+MY_PN="check_multiple"
+DESCRIPTION="A Nagios plugin to execute multiple checks in parallel"
+HOMEPAGE="https://github.com/clarkbox/${MY_PN}"
+SRC_URI="https://github.com/clarkbox/check_multiple/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+	distutils-r1_src_install
+
+	local nagiosplugindir="/usr/$(get_libdir)/nagios/plugins"
+	dodir "${nagiosplugindir}"
+
+	# Create a symlink from the nagios plugin directory to the /usr/bin
+	# location. The "binary" in /usr/bin should also be a symlink, since
+	# the python machinery allows the user to switch out the
+	# interpreter. We don't want to mess with any of that, so we just
+	# point to whatever the system would use if the user executed
+	# ${MY_PN}.
+	#
+	# The relative symlink is preferred so that if the package is
+	# installed e.g. while in a chroot, the symlink will never point
+	# outside of that chroot.
+	#
+	dosym "../../../bin/${MY_PN}" "${nagiosplugindir}/${MY_PN}"
+}
+
+python_test() {
+	"${EPYTHON}" -m unittest -v lib/check_multiple/check_multiple.py \
+		|| die "test suite failed"
+}
diff --git a/net-analyzer/nagios-check_rbl/Manifest b/net-analyzer/nagios-check_rbl/Manifest
index 7dbfdd0fcca2..8392966086bb 100644
--- a/net-analyzer/nagios-check_rbl/Manifest
+++ b/net-analyzer/nagios-check_rbl/Manifest
@@ -1,3 +1,3 @@
 DIST check_rbl-1.4.1.tar.gz 47585 BLAKE2B 24979d1579ef46f6d0626700bb8b9aa3f3acd4b422398ecbfa98909248fd6ffe61a763e377e7942d3078d8b91488f3fc0e2ab25f7c4821bcfa5cde08d000bd5c SHA512 3023aab6ba42dec46cb93eb2ef15e1998a1b3226bd1f143441e14a4271279ac9b24b85b9fc41a382eb203e5d2846b7f4ea4fe27db99d75b104d9182ea53079cb
-EBUILD nagios-check_rbl-1.4.1.ebuild 1456 BLAKE2B ad3d03252c427da70a304632a41ebbebd7ba1b756047fc0c1bfb1ab6d72753ce2d32b9e5f78e90c390cdde38fe40ed22a8f166ec31926a0e0a0a7d2a60118bb7 SHA512 601fa67e3f51ac0cc4415736ec33993e5f745910b08b5392cd010ff918220d1b860af2ce72911a5597131f6779ffdd220fd708d9fb139c29d8d913aa8b4280c4
+EBUILD nagios-check_rbl-1.4.1.ebuild 1485 BLAKE2B b60d808a2eda1a65bb625ca2bc11323a0a0a3926f0c206ba5fbef3c81f98a5891be6d623de9076b53323708d7d4d51e7439caa64a77e948c21ca576daebb1b28 SHA512 7ea10c4c18b769cec0bcfd992b8a41f045a25c19f4b8e521e5593fe0138037db6f55cf1e2ad6df8b87073f8e3135d5d9e8350cf339610395c2f5f419ee64bc10
 MISC metadata.xml 468 BLAKE2B 31fa2c6ba1b1c2860f89c7f1442fb0388e7285183f28e9656576e8c13bbb05298a9bd13dc78ca9bcc1ce47401eb1c83d56786c1f37481e351d1d0e9b32713986 SHA512 e75e18c5bfb8b7b6cbc4729dc791e687403c00a16705622bb1f956e29dccec25a8ce8179a6908358189edd8c0d8c8e29beaa31039a4d0356d7a75cacfec64d05
diff --git a/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.4.1.ebuild b/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.4.1.ebuild
index 2c96f81393b1..989d5be51a2f 100644
--- a/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.4.1.ebuild
+++ b/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.4.1.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="Monitor whether or not a host is blacklisted"
 HOMEPAGE="https://github.com/matteocorti/check_rbl"
 
 MY_P="${P/nagios-/}"
-SRC_URI="${HOMEPAGE}/releases/download/v${PV}/${MY_P}.tar.gz"
+SRC_URI="https://github.com/matteocorti/check_rbl/releases/download/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/net-analyzer/nagios-icinga-openvpn/Manifest b/net-analyzer/nagios-icinga-openvpn/Manifest
index 5c34b96ca0c7..cc6c463970d3 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 1118 BLAKE2B 6394f812bcf52e88e97b29d40e6f08397a6b234a8e5e7af736d8288805c58153a7f509041af99b3b48cb3fd526cf3d57c4c7908e158a8756a629a5ca3d4f46d0 SHA512 f37546d9424e369a030343981ba8d015c1272dc894a5787862e12a89b7348448bf58f2ad964c96b3d66b28e61645ee2936591d577afd79d6c07d82c179985c49
+EBUILD nagios-icinga-openvpn-0.0.1.ebuild 1152 BLAKE2B b72de1747493f07179be5b606c0f3a1ce1ca5ae861ad214a9cbf819b12fa91c824ddee0fd73485801f7060eb7e83783cbc7e812b995b44bd0bc372bd96c44098 SHA512 586c9ca186d75d2ebf6ab31b85caec3548029786c4eb15fbf92666ae1613651bff60966abd3b60055794106881941aeb1795d0f9a3efdfe37991a095072476d7
 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 355630403ebd..3db3bf94712e 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
@@ -1,15 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 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}"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/liquidat/nagios-icinga-openvpn/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/net-analyzer/nagios-plugin-check_raid/Manifest b/net-analyzer/nagios-plugin-check_raid/Manifest
index ab3f1e8c1470..866cc1096323 100644
--- a/net-analyzer/nagios-plugin-check_raid/Manifest
+++ b/net-analyzer/nagios-plugin-check_raid/Manifest
@@ -4,10 +4,10 @@ DIST nagios-plugin-check_raid-4.0.1.tar.gz 50173 BLAKE2B 35831f0511fc71b88391930
 DIST nagios-plugin-check_raid-4.0.2.tar.gz 50680 BLAKE2B f483876d3c7f7ec5d266d1cd22eddb50534505caa90d0715325148f6314e54aa83e4b42ad4ec8d7edcfed6c640af7e6f86f1f93314d92de39b02b67598f82339 SHA512 b02f32c91eb6bf54f4bd66cb57bf3d43b5f89320be095fcf31b224865f04f24c91245be2afee5ff8588757ff75462e62e1d89ef824e6fbe4d3f90d4a015e0ba3
 DIST nagios-plugin-check_raid-4.0.8.tar.gz 53803 BLAKE2B debc312ccf688c6ed4c4d89d77efbf454ae030260741277f1f10966d28348a317255a69a932ceba69300c37b98448ebb3ca3a0b463d64814a4ca11043bdc5850 SHA512 237cbe798aa6c65b4bd6b9c9e24923e172d3d62c50afd7df23e2b6c8888041368025860edf5f826a77c6858e6312bba05225f0e20787e1bb579d833950b324ee
 DIST nagios-plugin-check_raid-5da4400ff978189d6be889f2448099535baa01f4.tar.gz 46422 BLAKE2B a6049f58a4ff50bf86f85c6d8f35ffbc19a1a6ba6dccfb275bc59ea6e15635b8c8c001d5fbda6030f75adea78fb75dbb7e83628c73f9af76291c3547f64a1ee7 SHA512 4c4d372735576cf104886c62c071dc98512687ecc1b2f3d56f614c24b747566ff849119c3e0a71b011db5a32e67f50c9d772c0c68a895320e0a5b63322cf6446
-EBUILD nagios-plugin-check_raid-4.0.0-r1.ebuild 2059 BLAKE2B 22c1db9f426765b0add6e1e11cf0307b7189e00afcc3546a1061c64752bd02b08937a3ae2c8396a4146c556759fd6d3e5b037d187f517df34b95a54c5f9cf454 SHA512 ad110c1f364a19a58bbde964a7cfa4f4ee67100611e7de6f4d08471efbbb9748cefecfa0cdc15f92e53949df386c85a9f263cb04b1d70038c066ae8d753ed880
-EBUILD nagios-plugin-check_raid-4.0.0_p20151215.ebuild 2091 BLAKE2B b773dc8ace9426b193429ce5c51d5a55d4c017fd64cd6930097c4931f216d272a692cd3b7670b97614bc48d7f9344023cbd3052684a7882a9bf795735956c4f3 SHA512 bb017fdfff3efea747d92eb0b95019500dc83bea8501d658e174f377614597f3b4bef23d00387162f1fb6ada371aa217f9e7ac151e60d937786d20870377d015
-EBUILD nagios-plugin-check_raid-4.0.0_p20160215.ebuild 2091 BLAKE2B 87c12c8f21cd08e1b47c3d63289dbe10c1823fd8c54a9b2a4abb9d7b1b11b44b3ecf1bc764dabb6d608ae4b4e56e466c5585f7ad0f0a72ededfbade3e0aeb306 SHA512 626df7c95d72f6f9b1d2e56d61dc11110d3db83611f3f92e333bb1d62fbb9fe128f08f1542593c30e5380565af24fd29d1511c2d16ef42cb9648aa7a3c675a1f
-EBUILD nagios-plugin-check_raid-4.0.1.ebuild 2051 BLAKE2B 3a48f490dc44cd9abefb5b04c6110c94fb625e961686718bda7f581dc18ec5799c3497c97c49c4f4d0e237fcde86a2ceada6df96bd4a5bc49d536b0cbc5e3d02 SHA512 876dcd069f7481e17133994424016ae54a4f914b159086f1331f5b6cd55ddb1f51c7397b4eef4fd21377408d9dd1c9dcb5281e09cf46aff053efdca5120dd8cc
-EBUILD nagios-plugin-check_raid-4.0.2.ebuild 2051 BLAKE2B 3a48f490dc44cd9abefb5b04c6110c94fb625e961686718bda7f581dc18ec5799c3497c97c49c4f4d0e237fcde86a2ceada6df96bd4a5bc49d536b0cbc5e3d02 SHA512 876dcd069f7481e17133994424016ae54a4f914b159086f1331f5b6cd55ddb1f51c7397b4eef4fd21377408d9dd1c9dcb5281e09cf46aff053efdca5120dd8cc
-EBUILD nagios-plugin-check_raid-4.0.8.ebuild 2058 BLAKE2B afab16d2dbe1212a9b395d22b7599b67243c49ae0ba9804510b488864df9d354cc8550c9338e69a9875fc0c979f9b28abe00853c2c5808b7f9e921e7cd7a4eda SHA512 7133a577cf23710201551ff61846bb9fade98171bd88f7cb9f24e1f3aa02827660dbefb9bb149ad0d64f36614a38bc86afe496462cc7b47202e37f707e4e3f06
+EBUILD nagios-plugin-check_raid-4.0.0-r1.ebuild 2098 BLAKE2B cddb92993eb7d5180d239f6e919206d96d2940ecc79bae2fea4faf1557cb2d048c0f368c2fa6d4cd9d697c09e5eeb1d498c0876b0959e3765a210f35dd920108 SHA512 10a5714e65e8c76aabf59cd4dc5acc149ebcf2ef69bc611229880943395cae38eccaae90d48ac34ee4598882936762a40f4ad3e681ab0f8baa0178572f74820f
+EBUILD nagios-plugin-check_raid-4.0.0_p20151215.ebuild 2130 BLAKE2B 39a47860d6b99555887bf0606c02f1908a4d7a424289fa7ecc297429680c5dad3f46527f19ad34d7ec64b2be66aa4f0794e58532d8a6312cd3b55e13b8ebae22 SHA512 97ad974ea3db500427f4988e6b8d49e4b1615c14f4195d596e4ad3380a250a9711a1d4f417da3031e0972e170b3ef1e57a7ecd76a13f280eec51657049b63c21
+EBUILD nagios-plugin-check_raid-4.0.0_p20160215.ebuild 2130 BLAKE2B 62086fe5c17bdb79bfdcb47e060f65f77f88f2bea343c2cc950805d7b668d22b087fe2050100db93d33a342d1dac2cf91e40943a82058048727da250d4039c09 SHA512 ec6deb4cc754589f6986f7b746049de5a6e54e59d7ca8c904fc4d6be2c647f95d4ef2b3d48624549b7a596d187a06af52e2eb909ae16928c4190d798659c1221
+EBUILD nagios-plugin-check_raid-4.0.1.ebuild 2090 BLAKE2B db3a4d0bd578b05bb22417de9496296ac61fcb4091e15c69334c884991d3143b51d90b5a9930ffca36454727683295fef229d545d4ac11e0a0b3804eec7d3b0e SHA512 12502b85847d39632b3dd78145193e025810f8a4a2b0d85f50fea426975ef410dbe53f6343a3d7f5dde647fc0e2a2ec5e9e8039cb742b75d5d5ac2171de98299
+EBUILD nagios-plugin-check_raid-4.0.2.ebuild 2090 BLAKE2B db3a4d0bd578b05bb22417de9496296ac61fcb4091e15c69334c884991d3143b51d90b5a9930ffca36454727683295fef229d545d4ac11e0a0b3804eec7d3b0e SHA512 12502b85847d39632b3dd78145193e025810f8a4a2b0d85f50fea426975ef410dbe53f6343a3d7f5dde647fc0e2a2ec5e9e8039cb742b75d5d5ac2171de98299
+EBUILD nagios-plugin-check_raid-4.0.8.ebuild 2097 BLAKE2B c24464acf90fc2385a7ecda9de1f7de3a43f8fe5499adefcb5b6e8f66d8fb07bb50c74c5ef10c2ff6c6108419b06887d31e7e3c494c95a81ccd39ed29cc7ee27 SHA512 1a35f8bfedfd7710076bcd483af8ec7659d10d74c125a43bfef8d3c6d36a6645047ad46c78616d58e25602d9838ad3b83a0821cc017f91a961860184f39329c8
 MISC metadata.xml 1134 BLAKE2B 10f73b789386776485af1240eaaa83aec0555ecb04ea91ab5d7ff26ae19be485935ed7460187f4e9b7e9eac64b848f555b92cdf00267696b8a224b2b71dbf0f3 SHA512 9cad7c98ce113e9cb7802e3d55514e8f9548378aa9cbd78e8c8513313eba1f0f1b3f3e25a596798295425edac638fedcae68459ac89767ac2254f5bdffe4ceba
diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0-r1.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0-r1.ebuild
index f2a16be0167b..4c052fcf95dc 100644
--- a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0-r1.ebuild
+++ b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0-r1.ebuild
@@ -7,7 +7,7 @@ inherit eutils perl-module
 
 DESCRIPTION="Nagios/Icinga plugin to check current server's RAID status"
 HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/glensc/nagios-plugin-check_raid/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20151215.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20151215.ebuild
index 1d6241d036cf..ecce8533a4db 100644
--- a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20151215.ebuild
+++ b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20151215.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid"
 COMMIT="5da4400ff978189d6be889f2448099535baa01f4"
 MY_PV="${COMMIT:-$PV}"
 MY_P="${PN}-${MY_PV}"
-SRC_URI="${HOMEPAGE}/archive/${COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+SRC_URI="https://github.com/glensc/nagios-plugin-check_raid/archive/${COMMIT}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20160215.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20160215.ebuild
index b39e7c55fc8b..299a30000b74 100644
--- a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20160215.ebuild
+++ b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20160215.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid"
 COMMIT="02b6425dac3db7e98d4c36bf0836357c6b36196c"
 MY_PV="${COMMIT:-$PV}"
 MY_P="${PN}-${MY_PV}"
-SRC_URI="${HOMEPAGE}/archive/${COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+SRC_URI="https://github.com/glensc/nagios-plugin-check_raid/archive/${COMMIT}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.1.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.1.ebuild
index e17b33ae8af8..240668678c77 100644
--- a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.1.ebuild
+++ b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid"
 #COMMIT=""
 MY_PV="${COMMIT:-$PV}"
 MY_P="${PN}-${MY_PV}"
-SRC_URI="${HOMEPAGE}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+SRC_URI="https://github.com/glensc/nagios-plugin-check_raid/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.2.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.2.ebuild
index e17b33ae8af8..240668678c77 100644
--- a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.2.ebuild
+++ b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid"
 #COMMIT=""
 MY_PV="${COMMIT:-$PV}"
 MY_P="${PN}-${MY_PV}"
-SRC_URI="${HOMEPAGE}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+SRC_URI="https://github.com/glensc/nagios-plugin-check_raid/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.8.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.8.ebuild
index 646a7ed10467..dbdef9f63295 100644
--- a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.8.ebuild
+++ b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.8.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid"
 #COMMIT=""
 MY_PV="${COMMIT:-$PV}"
 MY_P="${PN}-${MY_PV}"
-SRC_URI="${HOMEPAGE}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+SRC_URI="https://github.com/glensc/nagios-plugin-check_raid/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/nagios-plugins-flameeyes/Manifest b/net-analyzer/nagios-plugins-flameeyes/Manifest
index d83c8c1a9c59..0954a95d8fd5 100644
--- a/net-analyzer/nagios-plugins-flameeyes/Manifest
+++ b/net-analyzer/nagios-plugins-flameeyes/Manifest
@@ -1,2 +1,2 @@
-EBUILD nagios-plugins-flameeyes-9999.ebuild 1106 BLAKE2B efb861fcc1f0adf020299a3fb37dc418974c4bdea7f1d8a5448140f6eafbfcbad7cccd3e3cf5c453574f49c915118be98e47a599eb485354d2c8aef5524bdf03 SHA512 256c85c10f2b2aeaa0db9618b62ef20e68cc56ad7058d73c70a8749ce0606640b976c87abe36c5ec8b69dc7fbf9ff40f1a8ffc409ef5f9318b81ea354b6786a1
+EBUILD nagios-plugins-flameeyes-9999.ebuild 1107 BLAKE2B a20d900da62f208cd2e03e01decadfb50e26cfd10502bf6c7d72b1967809641c9b994e3a5e1ef483a8d448922aace25fdf952ff4fa2296a6ae32ee086a2c0aeb SHA512 bb60220d159725156c080fdf255856f6f40ca4064ac563f218a31cbd051108a1f3ab7d04e7b2016d80e5678602e58107047c1f595f77d620f636f470ed453336
 MISC metadata.xml 626 BLAKE2B 5656a8de553bc783b4bd81891421e89b60a5d1693ddab0a0f7cc0ff527fd5c908c872e4797688db87e89cf8e8be12c1f8e0e6e12edfca93f17fe62f8ee688e6b SHA512 f89139edf88000f6767eeb1424ead0fc9a87e9ededbdb4277e73db92a766804182540aa82a0de37b7b708d0f5094fc816be9be2485a8f1af9190cc690cd57176
diff --git a/net-analyzer/nagios-plugins-flameeyes/nagios-plugins-flameeyes-9999.ebuild b/net-analyzer/nagios-plugins-flameeyes/nagios-plugins-flameeyes-9999.ebuild
index b60ce644e9bd..351eac1d17cc 100644
--- a/net-analyzer/nagios-plugins-flameeyes/nagios-plugins-flameeyes-9999.ebuild
+++ b/net-analyzer/nagios-plugins-flameeyes/nagios-plugins-flameeyes-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit git-2 multilib
+inherit git-r3 multilib
 
 EGIT_REPO_URI="https://github.com/Flameeyes/${PN}.git"
 SRC_URI=""
diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest
index dc07161dcd8a..7a6e1ce1dbee 100644
--- a/net-analyzer/nagstamon/Manifest
+++ b/net-analyzer/nagstamon/Manifest
@@ -3,7 +3,7 @@ AUX nagstamon-3.0-setup.patch 1139 BLAKE2B f399c6c600785629c7c90b1de396c17805882
 DIST Nagstamon-2.0.1.tar.gz 535814 BLAKE2B f366a0b5d2f2e4c7168bbb996b68aea7f9ea2f248c25505f8e2ca553d4c275260eec8fdad27b7c1187826cca0cebc7c027491a4f7b6acb24ddf604b6b6a8a930 SHA512 f9c8ab928a78f289693ae58cd3dde6fa75dd66dc931dbec6a4affc35bd96f16c39a03cb441575c9ca42e810ae5962fc7226513b8cc2a17871e0365aa3a207db6
 DIST Nagstamon-3.0.2.tar.gz 542005 BLAKE2B 090875cabbf22feea5cfe0eab0934b503d68df0f49c0a2e8056ccfed8251f278e149da5d0f8002cc5c96ffddd5b89a3ad997d90790e33c9cf1b9ffd9e32a83c0 SHA512 8b05b74adc7399b84cfb66d4c55ff80b2a37af7612496578bdc72ce00f712c8eae087204d00e7d7f1e1d35377f7bb8460d5cf337e315943a48a4ad5108e8d14f
 DIST Nagstamon-3.2.1.tar.gz 545190 BLAKE2B ce8b6624a3b1b61e307281ba193d07850bd5d104205d21e2967c1f65c0fdb217be2b2422d0312cfccaba766b814cb1f298a2ed62d07b7377530fd2ef3200a46f SHA512 c3ddda8d046d08514f7633b9129abebdc039e7faee5a618ef8ef77fc2c518bad798572fb549eb9ab9ef96377cd390e159934f268d9bd97c071c4895682bff8e6
-EBUILD nagstamon-2.0.1.ebuild 1188 BLAKE2B c7b20f426bad35ce37deabb64e18a8dcf374cb7f7d43516aed423ae12fda2b5d4ccf8c5f6ddc93aa1aff7f2e037b129cc44bd44bd818113a293c44b0cc223bd5 SHA512 46a35dbd486c0d2b6b3fd0c5768594c377253f5887302eab3eb0afdf7d25cccfae75e8369f81ddc882ed8842d55f8aaff9d054aac60b8cddd940e916c793684f
-EBUILD nagstamon-3.0.2-r1.ebuild 1378 BLAKE2B eb629c155a340da2a44da0028d0e5bbf0c0fc1770a249fce235914e02e322ad31b183df25ecd01f0035fd49ee94cc4dfa6d02f74b21df29d695ca24024a72ba8 SHA512 f491e0913cf8ce4f32187f50a5544169789c7ad843038cff420042ae1a6e67565f7d8b7b863f209860f4ae5da81d9dbfafa233f4a803280e7421ec00d4caf6c0
-EBUILD nagstamon-3.2.1.ebuild 1507 BLAKE2B 25993aae252c7fbe105e6c0986c8e1ce90ae00e04260e6d30239bd5a30f5d730034ae8042c79b5b6ed104cbea9830bcb7d69468927a45d6f448f1baa677b127f SHA512 d937268668cb9364b3cae7b5e0602d537a037c8d29b670eac56581cc6826ccff8b2187c43d98e065a7451ae791ba810e5122c94b53f12ee30e104f1556bfad38
+EBUILD nagstamon-2.0.1.ebuild 1184 BLAKE2B e3266f765f3cd0a6bb64e3b851358d152cf6bc107125ac21fc334c8b8ce56551ce4f01c9cf786f81fadbce2e1b479e6656dd6c2194147088f9f166f41e0f5733 SHA512 69d8101e5720eb8dfc4ccb2997a274e995623b948357ef5c20fb3c7e5c9bd372e1f51299b09d508ba033debd9284cd68108cee62d8c35302641b71003097f608
+EBUILD nagstamon-3.0.2-r1.ebuild 1374 BLAKE2B 093e6a2ecfc4712ab8b2b032c7ccdc38de68e769aa7efaa15631cfb13b41021c3d80cedf37b9e8379105a3d2cfa9b093c53114c96d468d9bf8f2da918f50728e SHA512 d903857718fd239725f39f2e347bda8a8857c9159531abd2d445bf44e1fe30281d1c480f75e63ac056d928b5e66d46f44fc502c999d700433f045f1f73e06685
+EBUILD nagstamon-3.2.1.ebuild 1503 BLAKE2B 3255251edb70611db3e397159aba274599afbf10060274d3e8943ecbeccd3493f2d65a71bebdfb91cbf81f91d6f2a8369c2a6c6c758c3bcba8de495aa65f51d7 SHA512 a84d5bef3ef5d6238f27849116e9838eb16ce05aec6b38f82466f83c790dcb3df26c867bd2250dbba62d4a92f255897f707177c8de719b73dfff569dfddd1a11
 MISC metadata.xml 525 BLAKE2B ad9c68b36b1260f907ceb8f50389fd0e035d441d33e99c71bb8dd493cda5cdaaa4e2ec32746d2b96d15b776d9de03070e411515f34e90c93063dd4b6b803c155 SHA512 5a1bf5be48ee8d28b501dceea33c65791b13cf0301c6bb170e4fe5ecd7b771cc28d3e9a49b82440770800854146961069cb26529ed5fe3e2c9a796329b085c64
diff --git a/net-analyzer/nagstamon/nagstamon-2.0.1.ebuild b/net-analyzer/nagstamon/nagstamon-2.0.1.ebuild
index e821856fd242..9e0174ed0c60 100644
--- a/net-analyzer/nagstamon/nagstamon-2.0.1.ebuild
+++ b/net-analyzer/nagstamon/nagstamon-2.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils python-r1 distutils-r1
 
diff --git a/net-analyzer/nagstamon/nagstamon-3.0.2-r1.ebuild b/net-analyzer/nagstamon/nagstamon-3.0.2-r1.ebuild
index af868ef5e77c..bd34a19dbb02 100644
--- a/net-analyzer/nagstamon/nagstamon-3.0.2-r1.ebuild
+++ b/net-analyzer/nagstamon/nagstamon-3.0.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils python-r1 distutils-r1
 
diff --git a/net-analyzer/nagstamon/nagstamon-3.2.1.ebuild b/net-analyzer/nagstamon/nagstamon-3.2.1.ebuild
index eda377457944..bb891b8c5697 100644
--- a/net-analyzer/nagstamon/nagstamon-3.2.1.ebuild
+++ b/net-analyzer/nagstamon/nagstamon-3.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils python-r1 distutils-r1
 
diff --git a/net-analyzer/namebench/Manifest b/net-analyzer/namebench/Manifest
deleted file mode 100644
index ba7b0b463483..000000000000
--- a/net-analyzer/namebench/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST namebench-1.3.1-source.tgz 1118505 BLAKE2B eeb1921dcdc627d9ab7d0742f7ad0e17915a301243b8f152472b9c8e545a0510655f637989ccc377b03d2b8c4f7c95dafbb8496fb49449bc9c2f2caad30e5708 SHA512 df9d120bf9f0bcbb5e3d41d2257b2c594e99b7e69b33435b59587e99dac6dca29e4ae81f51838946bc1955540109da6296abc6b69d411af2b91e05b58367bb3b
-EBUILD namebench-1.3.1-r3.ebuild 1051 BLAKE2B 21d1f618e195b62c0ee9ef6986775f0e9573dadc4affa39b1ea755870ba18f3c3f9fa7c88d2c1ef10f0b11a5cb230d1fd6fbc6bd2429a1f308d767b43193210c SHA512 9cc9acca3ffc717883103f3eacfe17de1501a596b06c149b29d22212173ef33db98ac20285f26a321d2f3d737818da82d4aabb038941bea9bcebf3d3edc2913c
-MISC metadata.xml 359 BLAKE2B ab64609d2c15ddc53f224bd9ef0acd57e4ab0571fa3eee09c8cef165339c8674db40adfa6fc3dfb3c1736dbb7e839fd13171e9a0360e6537855ad866ee6d8c59 SHA512 e7f84527d450abc038dd4962899a3a6789787049c8b097ec485f53b6b6143503e3d394be629c3987a450af6c718086bb5deabb38a8e95271d32fdfda7fcff3f6
diff --git a/net-analyzer/namebench/metadata.xml b/net-analyzer/namebench/metadata.xml
deleted file mode 100644
index 24087fdb9b23..000000000000
--- a/net-analyzer/namebench/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>netmon@gentoo.org</email>
-		<name>Gentoo network monitoring and analysis project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">namebench</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-analyzer/namebench/namebench-1.3.1-r3.ebuild b/net-analyzer/namebench/namebench-1.3.1-r3.ebuild
deleted file mode 100644
index 880c4fc0f9a3..000000000000
--- a/net-analyzer/namebench/namebench-1.3.1-r3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="DNS Benchmark Utility"
-HOMEPAGE="https://github.com/google/namebench"
-SRC_URI="https://namebench.googlecode.com/files/${P}-source.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-# PYTHON_REQ_USE does not support X? ( tk ) syntax yet
-DEPEND="X? ( $(python_gen_cond_dep dev-lang/python:2.7[tk] python2_7) )"
-RDEPEND="${DEPEND}
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.6[${PYTHON_USEDEP}]
-	>=dev-python/graphy-1.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.2.1[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.1.2[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# don't include bundled libraries
-	export NO_THIRD_PARTY=1
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	#set prefix
-	distutils-r1_python_install --install-data=/usr/share
-}
-
-python_install_all() {
-	dosym ${PN}.py /usr/bin/${PN}
-	distutils-r1_python_install_all
-}
diff --git a/net-analyzer/nbtscan/Manifest b/net-analyzer/nbtscan/Manifest
index 79f341e73692..d33b7e051698 100644
--- a/net-analyzer/nbtscan/Manifest
+++ b/net-analyzer/nbtscan/Manifest
@@ -2,5 +2,7 @@ AUX nbtscan-1.5.1-gentoo.patch 407 BLAKE2B bb761c5eab9b74d8988cae25ddb48662bab85
 AUX nbtscan-1.5.1-includes-declarations.patch 954 BLAKE2B 7cbac59c29c3472fef5a87abee1bdd456f82dc5893777aaa0afce40d82aefdecefc53e60e822e9e9677a26315f645eee1069f8ac53cabda7eaa0a83361e4de02 SHA512 793499744b91621462802a6c53c1ba3e53de0537549b1f48047b81f7b34aeb1d1fa4b6dbe3c99048139061b05c2b5db19d9bbd9cb4a74c735a756dfb52843cc3
 AUX nbtscan-1.5.1-script-whitespace.patch 3784 BLAKE2B 3d8651982b85f1adc09726e90367ec40fd14db5480f5a96157ff379e54b955af0040d438fe78381284374c7574b803977d8f741616b90244740af33effe49c30 SHA512 38c7450809d876f347b17e3b60809ae408168766c2e8898f56495b33e158168e98b5d2f74208f2927af1dea68bf9956bde4bf3a0cbbceb21bae9dd8cee6ec3f6
 DIST nbtscan-1.5.1.tar.gz 82107 BLAKE2B dd49ee25995c522f3cf75e35cca427be7a2b5e697b374323b0be4c6a92a2a96c9e30ca1844e953354f3490ed4090682592e1c0ea5192512b2883b1085356783f SHA512 2e2ac6a3ce7b188552c4f5f82b1e2bb99049bd0cd6f69361c59066c0b262d9311186aabc0c03c3096b7d2c48276052b1ddf230eba43051e221019c9bf223ae3e
+DIST nbtscan-1.6.tar.gz 27290 BLAKE2B 3e38e946aa875be2bca8ad0155a5bf4c612cecda3761623d75657b2ab54aa7a7526d284a78db764518748e092c2719a4c02bcdce32095c87537c9979571c10f7 SHA512 b791357160ae7fe784ebf3b74df551c0b7dcaeefae2ddd585a9e5ac0fe7dd1bb32f00d2b898dcd700e74809708f42fc8e5f0022254e1282914b3f668564b4bcb
 EBUILD nbtscan-1.5.1-r3.ebuild 736 BLAKE2B f5fef7112c42755b8f11dfdd3f3dfc1d2af7824c4c5b86db68c3b776e4dd246808a41a7f27dcbb05892f3d5260b5c01a70ec594d12517e6b0ed850a35b4dbb21 SHA512 0f198cff62bcc53416031c3bdb2382ed2ad65570e5c6e7c14a4e7d8bb5f88c2e72d0509494208f1bc5758cff23eae0d4baa111c7187f90d47911a59933e01a0b
+EBUILD nbtscan-1.6.ebuild 683 BLAKE2B fd40b34c3689032cd8640e21c81b420a80eb313c44db18c7ff5de83f813718d4e397dc0a288056eeee4910f6a4cc922cfdae38b965d60e717dd12265428fa79a SHA512 d861b27160f4ae782b3ef78bd80b71ea1f4f9013b46a3037286bb1d28db2de825811301a9ff8355f476dad7ee69d0c11f50cbf4598257ec436a7dfc0e2e3da8a
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/nbtscan/nbtscan-1.6.ebuild b/net-analyzer/nbtscan/nbtscan-1.6.ebuild
new file mode 100644
index 000000000000..9241d68431a2
--- /dev/null
+++ b/net-analyzer/nbtscan/nbtscan-1.6.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="NBTscan is a program for scanning IP networks for NetBIOS name information"
+HOMEPAGE="https://github.com/resurrecting-open-source-projects/nbtscan"
+SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+PATCHES=(
+#	"${FILESDIR}"/${PN}-1.5.1-script-whitespace.patch
+)
+DOCS=(
+	AUTHORS
+	CONTRIBUTING.md
+	ChangeLog
+	NEWS
+	README.md
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install () {
+	default
+}
diff --git a/net-analyzer/nessus-agent-bin/Manifest b/net-analyzer/nessus-agent-bin/Manifest
index ef95adcdc143..14fc3c90a396 100644
--- a/net-analyzer/nessus-agent-bin/Manifest
+++ b/net-analyzer/nessus-agent-bin/Manifest
@@ -1,4 +1,6 @@
 AUX nessusagent.initd 563 BLAKE2B 63820368c95dc2358ff73843e239a084e21cea48bd4dfd170e486f0c702e7ec6be1581478f7c37dd12868dd3648dfd8f44b8ff47c85fdab0276a0c84b78eb7d1 SHA512 acc9a64e1cbff1119876f186aa6c40d6f5772c55a919914c410fed9e0974d2ce8fe5b965248aeae590ae5dd551ab530c59dad42c6f793d995193f9b8f9d89718
 DIST NessusAgent-7.4.2-es7.x86_64.rpm 15989044 BLAKE2B 7fdc998acc4a5ee38519a3cf4d41d1de29cb8ddacb05bd6f734a458c63d7ce22c547b4d080320631d489dc381c4553d99a81786dcb48231833a77561ffa6928f SHA512 4aacc51d360c41963ad46c0976322cd29012d52e054337d4e0a303257796923bd35059324a041827ce0c54ef5c5dd6738311fcc4f0bcba19b6d4ea1e3730a146
+DIST NessusAgent-7.5.0-es7.x86_64.rpm 16793328 BLAKE2B 2a7409477f0d08d2be6d3c5e482f33e73861bc01c3c26e1edd689d71861621f5699ce0e2bb67e994dcd54e9e1314dee056b46aea79fe990bf1629e229ada8e64 SHA512 ed82b37d67a27a3fc9d317a9009afd42332b2935f869f72344f60946a28446ee606821b927f74a4899bb3c5d485b1a607935714ab604e206108db3abe99dcc38
 EBUILD nessus-agent-bin-7.4.2.ebuild 1970 BLAKE2B 278773d237abd92549945042f22e33de29803a1eb7f94678d85c8824fe4e93e932afa56bb250680a997706fe3be683f960656e48a8272e87ac9c8b628902b2ca SHA512 6b075584220409015a3e82cddc2f2b7d1b68aa1ec2093b6ddf350bb35461b4c29969fd02ee646b30bbf3c2cea5cbe6bd339b7b8f14bdb04122238d86da25c684
+EBUILD nessus-agent-bin-7.5.0.ebuild 1970 BLAKE2B 278773d237abd92549945042f22e33de29803a1eb7f94678d85c8824fe4e93e932afa56bb250680a997706fe3be683f960656e48a8272e87ac9c8b628902b2ca SHA512 6b075584220409015a3e82cddc2f2b7d1b68aa1ec2093b6ddf350bb35461b4c29969fd02ee646b30bbf3c2cea5cbe6bd339b7b8f14bdb04122238d86da25c684
 MISC metadata.xml 353 BLAKE2B e3ba298accb9a0618eb7340652a32cc166702f8873b49de734f6c117e2aeadbd9c31a76f231574ee04159454633191d4d3480925c05c993be174bf4efd3cc994 SHA512 81bc629de5c0367706b7b3259b3bb68edff6260dd47de345153af292a81fb6df23771b0f4974617f1fdef7b446dc17ab3c485d44d3dcb376e93c69173503a348
diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.5.0.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.5.0.ebuild
new file mode 100644
index 000000000000..20d896ea6290
--- /dev/null
+++ b/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.5.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rpm pax-utils systemd
+
+MY_P="NessusAgent-${PV}-es7"
+
+DESCRIPTION="A remote security scanner for Linux - agent component"
+HOMEPAGE="https://www.tenable.com/"
+SRC_URI="${MY_P}.x86_64.rpm"
+
+LICENSE="GPL-2 Nessus-EULA"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="mirror fetch strip"
+
+QA_PREBUILT="opt/nessus_agent/bin/nasl
+	opt/nessus_agent/bin/nessus-mkrand
+	opt/nessus_agent/lib/nessus/libjemalloc.so.${PV}
+	opt/nessus_agent/lib/nessus/libnessus-glibc-fix.so
+	opt/nessus_agent/lib/nessus/plugins/ovaldi64-rhel7.inc
+	opt/nessus_agent/sbin/nessus-check-signature
+	opt/nessus_agent/sbin/nessus-service
+	opt/nessus_agent/sbin/nessuscli
+	opt/nessus_agent/sbin/nessusd"
+
+S="${WORKDIR}"
+
+pkg_nofetch() {
+	einfo "Please download ${A} from ${HOMEPAGE}downloads/nessus-agents"
+	einfo "The archive should then be placed into your DISTDIR directory."
+}
+
+src_install() {
+	# Using doins -r would strip executable bits from all binaries
+	cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files"
+
+	pax-mark m "${D}"/opt/nessus_agent/sbin/nessusd
+
+	# Make sure these originally empty directories do not vanish,
+	# Nessus will not run properly without them
+	keepdir /opt/nessus_agent/com/nessus/CA
+	keepdir /opt/nessus_agent/etc/nessus
+	keepdir /opt/nessus_agent/var/nessus/logs
+	keepdir /opt/nessus_agent/var/nessus/tmp
+	keepdir /opt/nessus_agent/var/nessus/users
+
+	newinitd "${FILESDIR}"/nessusagent.initd nessusagent
+	systemd_dounit usr/lib/systemd/system/nessusagent.service
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "In order to link the agent to Tenable.io or an instance of Nessus Manager,"
+		elog "obtain an appropriate linking key and run"
+		elog ""
+		elog "  /opt/nessus_agent/sbin/nessuscli agent link --key=<key> --host=<host> --port=<port> [optional parameters]"
+		elog ""
+		elog "This can be done before the agent is started."
+	fi
+}
diff --git a/net-analyzer/nessus-bin/Manifest b/net-analyzer/nessus-bin/Manifest
index fb42f05b1726..adb6efc7511b 100644
--- a/net-analyzer/nessus-bin/Manifest
+++ b/net-analyzer/nessus-bin/Manifest
@@ -1,4 +1,6 @@
 AUX nessusd-initd 582 BLAKE2B 67c5e73262512c590b5b4fc0668297a504677aa3d771fdeee2809c921d988faef19cbf10a7fb26d52114e1a67d33ef197e32c561cd5b2003c8abbde2dfe5cb4f SHA512 f825fad89564303aeff423f3c32a1544ee4b063ef57702cd54220aebed8e01e7b178ff5bd10b48b654ebdee78657a9bc41caf779a23968d008916fd51e88b2f4
 DIST Nessus-8.5.2-es7.x86_64.rpm 72892020 BLAKE2B c5ae05c02da4fe3265ae1b31da0d8dc025c7275ef466d7f889ebefe6a6006e500e2df029ab90ab37cd0c5089078a22b4f0474a4cfa830a378aead68337154f91 SHA512 ef96ee30b693c72a33981757a8e9616ce7813837de90065c8d140e9702552798e09c0941c282d1a54817f036f606a9934bc9020e86dce12baf50a1a57dbcec08
+DIST Nessus-8.8.0-es7.x86_64.rpm 77275432 BLAKE2B 437d4f958d0f45924cb0c994710d908b6a0a48bbee9ffa184391e7a31484d9c933a210c7d4c6d68fa918a873e09874a58ed40ca81203aaef5c44541037777dbd SHA512 d779703db9c114a51e282dde35257121278fa4ec6035c0c861ebc9f04e967aa2a0cde1efdd4f08c2652ecfab3978a8853970081759e9dee492a3ebe8c4fc502b
 EBUILD nessus-bin-8.5.2.ebuild 1654 BLAKE2B 0d59c80388e1119268776c8c98c6996d1c702d6362e2d4d1f3f69c950352aa420c9484c48d636904e8842e38478d3af86c4a458b9833d24f4a7923a9e8d7e70c SHA512 97b5baa4b22213b5211acccfb63292f210170c4ee6156f1035e077b0a914c6f4aea263f10a76f8530cfecca50bd0bfd1b82b7261c5b001f51dbce7b0a37252df
+EBUILD nessus-bin-8.8.0.ebuild 1654 BLAKE2B 0d59c80388e1119268776c8c98c6996d1c702d6362e2d4d1f3f69c950352aa420c9484c48d636904e8842e38478d3af86c4a458b9833d24f4a7923a9e8d7e70c SHA512 97b5baa4b22213b5211acccfb63292f210170c4ee6156f1035e077b0a914c6f4aea263f10a76f8530cfecca50bd0bfd1b82b7261c5b001f51dbce7b0a37252df
 MISC metadata.xml 345 BLAKE2B 05fdd17a4decd9a096175a59991a6df8260591c09193fef114895d7d29e0f08210aacd4517678410813d06a27b1032889c529e2966427c5a9ad454f9534d25f5 SHA512 3535519b1c621f6df120e6aa39f9a11ec132b68499a029915650218c16e9ca1a07cb30409ace95b2aa0204194a61c7b4743051e1f4ffc94cb5ba3372cac72e8c
diff --git a/net-analyzer/nessus-bin/nessus-bin-8.8.0.ebuild b/net-analyzer/nessus-bin/nessus-bin-8.8.0.ebuild
new file mode 100644
index 000000000000..45aa75d3c45a
--- /dev/null
+++ b/net-analyzer/nessus-bin/nessus-bin-8.8.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rpm pax-utils systemd
+
+MY_P="Nessus-${PV}-es7"
+
+DESCRIPTION="A remote security scanner for Linux"
+HOMEPAGE="https://www.tenable.com/"
+SRC_URI="${MY_P}.x86_64.rpm"
+
+LICENSE="GPL-2 Nessus-EULA"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="mirror fetch strip"
+
+QA_PREBUILT="opt/nessus/bin/nasl
+	opt/nessus/bin/ndbg
+	opt/nessus/bin/nessus-mkrand
+	opt/nessus/lib/nessus/libjemalloc.so.2
+	opt/nessus/lib/nessus/libnessus-glibc-fix.so
+	opt/nessus/sbin/nessus-service
+	opt/nessus/sbin/nessuscli
+	opt/nessus/sbin/nessusd"
+
+S="${WORKDIR}"
+
+pkg_nofetch() {
+	einfo "Please download ${A} from ${HOMEPAGE}downloads/nessus"
+	einfo "The archive should then be placed into your DISTDIR directory."
+}
+
+src_install() {
+	# Using doins -r would strip executable bits from all binaries
+	cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files"
+
+	pax-mark m "${D}"/opt/nessus/sbin/nessusd
+
+	# Make sure these originally empty directories do not vanish,
+	# Nessus will not run properly without them
+	keepdir /opt/nessus/com/nessus/CA
+	keepdir /opt/nessus/etc/nessus
+	keepdir /opt/nessus/var/nessus/logs
+	keepdir /opt/nessus/var/nessus/tmp
+
+	newinitd "${FILESDIR}"/nessusd-initd nessusd-bin
+	systemd_newunit usr/lib/systemd/system/nessusd.service nessusd-bin.service
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "To get started launch the nessusd-bin service, then point your Web browser to"
+		elog "  https://<yourhost>:8834/"
+	else
+		elog "You may want to restart the nessusd-bin service to use"
+		elog "the new version of Nessus."
+	fi
+}
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index 73e8a013dde7..4eaed2360faf 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,6 +1,5 @@
-DIST netdata-1.18.1.tar.gz 3413907 BLAKE2B 9047f23875f446b378c80962e7f8e5c9424fbc2a405c75b76e242b26ae48336cbb026d3fc5c0e4127b0e5d1f1d5a14652ae92661474cd11ecbd64614461ab118 SHA512 fb72f4729e05ab83fe9462e31b10fc40243472ea9f6cbb9421e2ca549810f2f80b28b05e886faa66e15c53b317ee559a3e0fb3d382c36a424dd39fec779918d9
+AUX netdata-1.19.0-prometheus-spelling.patch 1149 BLAKE2B 567e93c8099f7edc6afd3c40a6249162f44dca30f9cccf1702df453523203ee2e79fb4d03a53f5b1c4e5dd6dfaa52961b0717546aa21bc25bb3927a9280598ad SHA512 a498b04683138fd56e71bcf1191b4f3a655be03746f850d9f407bbe24c28f16dd564967401c856ce404f58c6a947b8277e2fa0868dbe7c0aa63ff05a8b465561
 DIST netdata-1.19.0.tar.gz 3443251 BLAKE2B 8e18a661367850e712a75c1c11b661a977bf77b48369e0e36763a74f96b3726c523093a82eb6f94257c02e754d900cb675d501fda824ceb94eef31dfa30e5712 SHA512 026ae159d8ed52a30e406c110c2732e54e50f070865ba3e430df73e4df40387105053e750ca6029cfbc7f40a2c05b7fb6ba4e3e4a7070822c7eec4c1a4712aea
-EBUILD netdata-1.18.1-r1.ebuild 2757 BLAKE2B 1393c8575061ae6d7ee93b7f376155c0dba91da48ff283176f192fc46e01aff1459234fdadc4c8ab711e77169fc5e6c393dc87234ff30d900a9514aa6396a5ab SHA512 93d03fb2caeb01fb51a7e51b6191e8f99c4a0865165918d6e921b24a22c402dd601d8511980c28f2766320d0651da45e1015571c6b251b5bf5e2928cfe2d77eb
-EBUILD netdata-1.19.0-r1.ebuild 2895 BLAKE2B b417866ba85e6fd75845053bce61aabef3647e65862b7e9746c5c52e59a4c3249a3ccee8fb50a5dcd7b9b36fbb390a471ba061fa669a44830ad07653573f4502 SHA512 9bf42bc88658a0af839f81fb13375f944911531959b02cd70bffb118f9fd1588adad9834c4009c0767dc206538d0beee9384215e3cc5c98909c6cc193a1b885f
-EBUILD netdata-9999.ebuild 2895 BLAKE2B b417866ba85e6fd75845053bce61aabef3647e65862b7e9746c5c52e59a4c3249a3ccee8fb50a5dcd7b9b36fbb390a471ba061fa669a44830ad07653573f4502 SHA512 9bf42bc88658a0af839f81fb13375f944911531959b02cd70bffb118f9fd1588adad9834c4009c0767dc206538d0beee9384215e3cc5c98909c6cc193a1b885f
-MISC metadata.xml 939 BLAKE2B fa9652dfc67eb1f088383a62d435349665f81dc9db3e1dd9c8412110f27297cc15681cbd2307c8a09cd490bd195e830311bf9a2612abfe14ecec18fb99a17eed SHA512 c9e7794f190c22d0b5a14d2431d7f15d7b048fcbcf8cf48499e6a71fb21f7fc0292bd944db6767e1f70413c484a338ffeccbf7a70c63d7c128e4bc72c7d24fe3
+EBUILD netdata-1.19.0-r2.ebuild 3301 BLAKE2B b112d96251fec1cb4492aeea5d236841b54011f70604ee425239bed81b7cc0c65c4eea9567c53535d8471a108b2390c5260cd7df300dc955b568e20263c80e3f SHA512 fc0241a4053a6804288ad791477887d165b5763ae7e2d6c7b0ed2cf30e97fc51ef511c28b7272c96a3ee30d6ce65702074e1c5d99bf38cb22b05e6c08ca12af6
+EBUILD netdata-9999.ebuild 3242 BLAKE2B 7fc66998ce13afdd645676053b71d6b857e8a6098a5b2bda72125b26b6fa55c42d58238f9306cd4930b0426de7d7a9794611098856cb452e4c64216c42c0246f SHA512 e9a16abf1c0c99fe134a60e8a088c95381c22d171652ce23b98478ccaf9d258950b842176ef72a7422609633e855aa9a501e9ec09dc61ab3e63fe895f469c936
+MISC metadata.xml 1270 BLAKE2B e2c5bac8fd169d84daf8a6e6cfea30761490cca3d7211a29e29f6cf298a9cd728ddc56075e5a85c8f5ed5467900a2f3fb1e09c40b764c2bb0e02bf1ff8e98108 SHA512 77e4d91d31d9d48b769b13f5c9778e09fc8d64941a145ea0bc1ce3e735eb64e5c89fa36a4314753e7c0871738a7b3e94f6a998a87b9c7b9d1d7aa6e8800cdbdf
diff --git a/net-analyzer/netdata/files/netdata-1.19.0-prometheus-spelling.patch b/net-analyzer/netdata/files/netdata-1.19.0-prometheus-spelling.patch
new file mode 100644
index 000000000000..25c8dd4051ff
--- /dev/null
+++ b/net-analyzer/netdata/files/netdata-1.19.0-prometheus-spelling.patch
@@ -0,0 +1,20 @@
+https://github.com/netdata/netdata/pull/7674
+
+From d19b834d0011485759604ecfa095a898b597d8e0 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Sun, 5 Jan 2020 16:13:18 -0500
+Subject: [PATCH] Fix spelling of Prometheus (#7673)
+
+diff --git a/configure.ac b/configure.ac
+index 00927ba8b1..8b2facb966 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -999,7 +999,7 @@ test "${enable_backend_prometheus_remote_write}" = "yes" -a "${have_CXX_compiler
+     AC_MSG_ERROR([C++ compiler required but not found. try installing g++])
+ 
+ AC_MSG_CHECKING([if prometheus remote write backend should be enabled])
+-if test "${enable_backend_prometeus_remote_write}" != "no" -a "${have_libprotobuf}" = "yes" -a "${have_libsnappy}" = "yes" \
++if test "${enable_backend_prometheus_remote_write}" != "no" -a "${have_libprotobuf}" = "yes" -a "${have_libsnappy}" = "yes" \
+                                                            -a "${have_protoc}" = "yes" -a "${have_CXX_compiler}" = "yes"; then
+     enable_backend_prometheus_remote_write="yes"
+     AC_DEFINE([ENABLE_PROMETHEUS_REMOTE_WRITE], [1], [Prometheus remote write API usability])
diff --git a/net-analyzer/netdata/metadata.xml b/net-analyzer/netdata/metadata.xml
index a160e06f3657..70b99cd52f39 100644
--- a/net-analyzer/netdata/metadata.xml
+++ b/net-analyzer/netdata/metadata.xml
@@ -9,8 +9,12 @@
     <flag name="compression">Enable compression via zlib</flag>
     <flag name="dbengine">Enable the Netdata database engine</flag>
     <flag name="ipmi">Install <pkg>sys-apps/ipmitool</pkg> required for monitoring IPMI sensors.</flag>
+    <flag name="jsonc">Enable optimization of JSON using <pkg>dev-libs/json-c</pkg></flag>
+    <flag name="kinesis">Enable support for Amazon Kenesis as a backend</flag>
+    <flag name="mongodb">Enable support for the mongodb backend</flag>
     <flag name="nfacct">Enable the nfacct plugin</flag>
     <flag name="nodejs">Enable use of nodejs (which some plugins use)</flag>
+    <flag name="prometheus">Enable support for the Prometheus remote write backend</flag>
     <flag name="tor">Enable monitoring of tor</flag>
     <flag name="xen">Enable monitoring of xen</flag>
   </use>
diff --git a/net-analyzer/netdata/netdata-1.18.1-r1.ebuild b/net-analyzer/netdata/netdata-1.18.1-r1.ebuild
deleted file mode 100644
index 3a8c0f7f98d0..000000000000
--- a/net-analyzer/netdata/netdata-1.18.1-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit autotools fcaps linux-info python-r1 systemd
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Linux real time system monitoring, done right!"
-HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
-
-LICENSE="GPL-3+ MIT BSD"
-SLOT="0"
-IUSE="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi mysql nfacct nodejs postgres +python tor xen"
-REQUIRED_USE="
-	mysql? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tor? ( python )"
-
-# most unconditional dependencies are for plugins.d/charts.d.plugin:
-RDEPEND="
-	acct-group/netdata
-	acct-user/netdata
-	app-misc/jq
-	>=app-shells/bash-4:0
-	|| (
-		net-analyzer/openbsd-netcat
-		net-analyzer/netcat
-	)
-	net-misc/curl
-	net-misc/wget
-	sys-apps/util-linux
-	virtual/awk
-	caps? ( sys-libs/libcap )
-	cups? ( net-print/cups )
-	dbengine? (
-		dev-libs/libuv
-		app-arch/lz4
-		dev-libs/judy
-		dev-libs/openssl:=
-	)
-	compression? ( sys-libs/zlib )
-	ipmi? ( sys-libs/freeipmi )
-	nfacct? (
-		net-firewall/nfacct
-		net-libs/libmnl
-	)
-	nodejs? ( net-libs/nodejs )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		mysql? (
-			|| (
-				dev-python/mysqlclient[${PYTHON_USEDEP}]
-				dev-python/mysql-python[${PYTHON_USEDEP}]
-			)
-		)
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-		tor? ( net-libs/stem[${PYTHON_USEDEP}] )
-	)
-	xen? (
-		app-emulation/xen-tools
-		dev-libs/yajl
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-FILECAPS=(
-	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-user=netdata \
-		--disable-jsonc \
-		$(use_enable cups plugin-cups) \
-		$(use_enable dbengine) \
-		$(use_enable nfacct plugin-nfacct) \
-		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable xen plugin-xenstat) \
-		$(use_enable cpu_flags_x86_sse2 x86-sse) \
-		$(use_with compression zlib)
-}
-
-src_install() {
-	default
-
-	rm -rf "${D}/var/cache" || die
-
-	# Remove unneeded .keep files
-	find "${ED}" -name ".keep" -delete || die
-
-	fowners -Rc netdata:netdata /var/log/netdata
-	keepdir /var/log/netdata
-	fowners -Rc netdata:netdata /var/lib/netdata
-	keepdir /var/lib/netdata
-	keepdir /var/lib/netdata/registry
-
-	fowners -Rc root:netdata /usr/share/${PN}
-
-	newinitd system/netdata-openrc ${PN}
-	systemd_dounit system/netdata.service
-	insinto /etc/netdata
-	doins system/netdata.conf
-}
diff --git a/net-analyzer/netdata/netdata-1.19.0-r1.ebuild b/net-analyzer/netdata/netdata-1.19.0-r2.ebuild
index 7133c9ae7f67..2c99a7a4fe82 100644
--- a/net-analyzer/netdata/netdata-1.19.0-r1.ebuild
+++ b/net-analyzer/netdata/netdata-1.19.0-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit autotools fcaps linux-info python-r1 systemd
 
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
 
 LICENSE="GPL-3+ MIT BSD"
 SLOT="0"
-IUSE="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi mysql nfacct nodejs postgres +python tor xen"
+IUSE="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
 REQUIRED_USE="
 	mysql? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -49,11 +49,18 @@ RDEPEND="
 	)
 	compression? ( sys-libs/zlib )
 	ipmi? ( sys-libs/freeipmi )
+	jsonc? ( dev-libs/json-c )
+	kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
+	mongodb? ( dev-libs/mongo-c-driver )
 	nfacct? (
 		net-firewall/nfacct
 		net-libs/libmnl
 	)
 	nodejs? ( net-libs/nodejs )
+	prometheus? (
+		dev-libs/protobuf:=
+		app-arch/snappy
+	)
 	python? (
 		${PYTHON_DEPS}
 		dev-python/pyyaml[${PYTHON_USEDEP}]
@@ -77,6 +84,10 @@ FILECAPS=(
 	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
 )
 
+PATCHES=(
+	"${FILESDIR}/${P}-prometheus-spelling.patch"
+)
+
 pkg_setup() {
 	linux-info_pkg_setup
 }
@@ -90,11 +101,14 @@ src_configure() {
 	econf \
 		--localstatedir="${EPREFIX}"/var \
 		--with-user=netdata \
-		--disable-jsonc \
+		$(use_enable jsonc) \
 		$(use_enable cups plugin-cups) \
 		$(use_enable dbengine) \
 		$(use_enable nfacct plugin-nfacct) \
 		$(use_enable ipmi plugin-freeipmi) \
+		$(use_enable kinesis backend-kinesis) \
+		$(use_enable mongodb backend-mongodb) \
+		$(use_enable prometheus backend-prometheus-remote-write) \
 		$(use_enable xen plugin-xenstat) \
 		$(use_enable cpu_flags_x86_sse2 x86-sse) \
 		$(use_with compression zlib)
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
index 7133c9ae7f67..6e2a420b82c9 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit autotools fcaps linux-info python-r1 systemd
 
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
 
 LICENSE="GPL-3+ MIT BSD"
 SLOT="0"
-IUSE="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi mysql nfacct nodejs postgres +python tor xen"
+IUSE="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
 REQUIRED_USE="
 	mysql? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -49,11 +49,18 @@ RDEPEND="
 	)
 	compression? ( sys-libs/zlib )
 	ipmi? ( sys-libs/freeipmi )
+	jsonc? ( dev-libs/json-c )
+	kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
+	mongodb? ( dev-libs/mongo-c-driver )
 	nfacct? (
 		net-firewall/nfacct
 		net-libs/libmnl
 	)
 	nodejs? ( net-libs/nodejs )
+	prometheus? (
+		dev-libs/protobuf:=
+		app-arch/snappy
+	)
 	python? (
 		${PYTHON_DEPS}
 		dev-python/pyyaml[${PYTHON_USEDEP}]
@@ -90,11 +97,14 @@ src_configure() {
 	econf \
 		--localstatedir="${EPREFIX}"/var \
 		--with-user=netdata \
-		--disable-jsonc \
+		$(use_enable jsonc) \
 		$(use_enable cups plugin-cups) \
 		$(use_enable dbengine) \
 		$(use_enable nfacct plugin-nfacct) \
 		$(use_enable ipmi plugin-freeipmi) \
+		$(use_enable kinesis backend-kinesis) \
+		$(use_enable mongodb backend-mongodb) \
+		$(use_enable prometheus backend-prometheus-remote-write) \
 		$(use_enable xen plugin-xenstat) \
 		$(use_enable cpu_flags_x86_sse2 x86-sse) \
 		$(use_with compression zlib)
diff --git a/net-analyzer/nethogs/Manifest b/net-analyzer/nethogs/Manifest
index 12d0326743e7..2cff8107c6f0 100644
--- a/net-analyzer/nethogs/Manifest
+++ b/net-analyzer/nethogs/Manifest
@@ -1,3 +1,3 @@
 DIST nethogs-0.8.5.tar.gz 112385 BLAKE2B 1d4867447455720a11f3131787b731428550f03d106ad476367ae356954c6c9895d02a8e730488b3deb9638d54bd60765cb63bcf599f4ec73c0bdc8da3d52cae SHA512 a2be81fcebc9925dd8a0fd9f71c6e790206819e0cc5efeeeb0c741baa9fd25ec685a1784b6d331d938cf14381403f9c13d619509d0ffe713ce8786a83a380908
-EBUILD nethogs-0.8.5-r1.ebuild 687 BLAKE2B 3327b3f3cd5c122d19d03290c475083767614e092a3a83db48d45b2af83930e7b835029165427002ccdc74b383fb40e6d8c7fd853c59c06eec81a7eb8e709ab1 SHA512 2cb80a6c06355bded0292b1a30d60d681e4b4fd7a624eabb38bc9b3ac8308e8c84af20e9a401164bae66a98fa5ad821a86ff0faee6188255cb9586ae0f42c20f
+EBUILD nethogs-0.8.5-r1.ebuild 709 BLAKE2B 736926c398491d587490195959d36bb00d329743661faa63f0444cb5c745434b2133144dc1fadd032922ed5522d99af96cd3f863d952fe5c2bdadc1aa3e32294 SHA512 ffca46cb1a512034e662d8056020a9d4d12b1bdb66516215c6a74e636211358aed9237c6d312ed6964e88e00272317e3394e39c1921d097fb0358602d01c2419
 MISC metadata.xml 898 BLAKE2B 401dd16bdfff0b3ab7baa1c51a28938ac428b4ff646e46e65efd7a5f612541be58a35c4ef68f48cec0b3f63af1624377615f8b4bb14bd8e8d9f4c297708e3b3c SHA512 324d822a63e6a8e179d487c840ae2fe10c5cb16a6973c40d480666e5a3d95b596495c1989de8afe8809a6888a17fccef7b7ca4ebacd0d4d0543611253dfa73ed
diff --git a/net-analyzer/nethogs/nethogs-0.8.5-r1.ebuild b/net-analyzer/nethogs/nethogs-0.8.5-r1.ebuild
index 412c581fafa1..6b03eed58ae1 100644
--- a/net-analyzer/nethogs/nethogs-0.8.5-r1.ebuild
+++ b/net-analyzer/nethogs/nethogs-0.8.5-r1.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="A small 'net top' tool, grouping bandwidth by process"
 HOMEPAGE="https://github.com/raboof/nethogs"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/raboof/nethogs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/netselect/Manifest b/net-analyzer/netselect/Manifest
index bc0209fa1c9d..42fda23795f3 100644
--- a/net-analyzer/netselect/Manifest
+++ b/net-analyzer/netselect/Manifest
@@ -3,4 +3,5 @@ AUX netselect-0.4-flags.patch 172 BLAKE2B 17acc10b64404c9d8525147f5ca526f661a2b2
 DIST netselect-0.4-ipv6.patch.xz 18272 BLAKE2B 6197057085e892c156a9fb3a82ac0030a2ff1b4276dde48405de2d2bcfdcef066c4f3eeff174f766af23d2807085f97e459dbffc87b2a2950a472e7964f2e3fc SHA512 422b54df5be45379fe7d6776b6e653a8e49df6fb77421527f2eb6c687597f36cccc7ab5cc5206e9823c318f6facd84fb4e8c0dbffbf9641cee593401cb73abea
 DIST netselect-0.4.tar.gz 22095 BLAKE2B 1dd83c4dcd38ab7b987ead76f4e7e727980bbad91b59c56948e13540307e685984cc11ea94292d38959c8253f1f6ec2e6e6e044302f26b09153717d6e29e96be SHA512 eee9639122b7cc89218c610794d090582aecb3df138bcef41472c8d40c0f7e998b2c4b04aace13795fda5c710ee28cc2c0784a680ad6d1aa6a14eb441a408bfa
 EBUILD netselect-0.4-r1.ebuild 971 BLAKE2B 763fdcf48e8117f6aee40abae77518e1368ef14cff7b11aac8d635b018dc5b88a99500963e41291618e2968a38123298ab78fd4a99f4f53814bd121ab1404653 SHA512 c827f560baefb52e52775043e610eb4baac9872dd323e0cc7a2bf0347c198fe554f5b1991eead44bdf8c4b100df7fa9fe9ae986bc3bd7a8f49d55975c5ad6de0
+EBUILD netselect-9999.ebuild 900 BLAKE2B 581801a56b90a1a856796e0995c6bd4037d52fd14eeb2e1aad47eaf980c0996d8a865b1e95429bd0913e750b4bd0ded217a4ec8a00b308c1a81f02305c6651f6 SHA512 c2619dacf3aba239f68a245ef283f1a7839fcc639fafcd41e8acbebf36e11396997074faab2e36a61c71c0a7665a695f0df838f351bf95a321cabf9a45493b0f
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/netselect/netselect-9999.ebuild b/net-analyzer/netselect/netselect-9999.ebuild
new file mode 100644
index 000000000000..de08fdebbdfa
--- /dev/null
+++ b/net-analyzer/netselect/netselect-9999.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit git-r3 toolchain-funcs
+
+DESCRIPTION="Ultrafast implementation of ping"
+HOMEPAGE="http://apenwarr.ca/netselect/"
+EGIT_REPO_URI="
+	https://github.com/apenwarr/${PN}
+"
+SRC_URI="
+	ipv6? ( https://dev.gentoo.org/~jer/${PN}-0.4-ipv6.patch.xz )
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE="ipv6"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4-bsd.patch
+	"${FILESDIR}"/${PN}-0.4-flags.patch
+)
+
+src_unpack() {
+	use ipv6 && unpack ${A}
+	git-r3_src_unpack
+}
+
+src_prepare() {
+	use ipv6 && PATCHES+=( "${WORKDIR}"/${PN}-0.4-ipv6.patch )
+
+	default
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" LDFLAGS="${CFLAGS} ${LDFLAGS}"
+}
+
+src_install () {
+	dobin netselect
+
+	if ! use prefix ; then
+		fowners root:wheel /usr/bin/netselect
+		fperms 4711 /usr/bin/netselect
+	fi
+
+	dodoc HISTORY README
+
+	doman netselect.1
+}
diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index 779b87853d55..9b390f1fc51c 100644
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -6,7 +6,7 @@ DIST nfdump-1.6.14-security.patch 31579 BLAKE2B d747526f46837e99193bf761bceb853b
 DIST nfdump-1.6.14.tar.gz 1834355 BLAKE2B be92ec6c6eb60c883863a21e7d203c487f176e862f6227bf21d17ade2a04815095c5c119719a18c106401519d7976a2b82e46a11b7f207494abef3e0f73d2716 SHA512 c5e5540526dfce3798728930576e4c7930c3ff80893a94d7f9e65c7c577d1e78bdc47a99c47cee837327ad202197afc378d2408b1b9b847044d0110146055ffe
 DIST nfdump-1.6.15.tar.gz 1834855 BLAKE2B 1892cfbd1d1299c44b14a39b55c766d3dd411d7410a66b8ecbebe590c9da595c79764966ef1c91adb91b936ee3c052ad14bca27c6bcb98472011eb2c67dff60f SHA512 a6bb4f2293ad85d8f16025e7272b889d3814cea2e9255dbd315ee92754675e4ee925c3ebe4e1350f2d5452d69d1d3c13ddeb656324a409c4744da1d4927fe1f2
 DIST nfdump-1.6.16.tar.gz 1814857 BLAKE2B cd50680adbb6023915232bb780daf2bcc4319348444a28c89fc4fdfd19225bdf243bb42179a6bd545c06ab6fafa50091401b7a286527d1863c888a96c0b0a2eb SHA512 c1af3cf984c7eaaf1012c71c061e00f12dbcdf276306096436eb707552932c65b9f03e7a22b4cc0989d951c433f32c5c927600a8248826227f10b4fb2d906a32
-EBUILD nfdump-1.6.14-r1.ebuild 1370 BLAKE2B ee1e4341ddb76c23ca8efe3f7e37f8ad9f8600ab29067de7d0b567389792b46c975d4d44408a79f40e0e6f59172d314fe9e066601a4662462c71db2579cc6f4b SHA512 b3ffa1d9324be60cb95a7ba73b0769903617fca1b193044ac677b415414b77c31f479973221a42151c63d03a6a23bb988e41315b8890c1f6001c79d8ff65c48e
-EBUILD nfdump-1.6.15-r1.ebuild 1356 BLAKE2B 384c6b291de716ea4363854d2645295ac9bb4707622db6bcdc06f29be740807fe907eba6d836bfe92064659eb32ff508dcb661729c5551a2ebb8e967da6811c3 SHA512 607d60696466c40694feff8f2b044acb44c49b4f9a701abccd957d9d5e0f9bfbfd0c64cb46603950ad66b39355cfe288645345ae0c5789404f202f5403e96982
-EBUILD nfdump-1.6.16-r1.ebuild 1389 BLAKE2B 47d4a9383d02607e98f27896320cf4a2c42a2f01b116149fa1a0c9126d4082f76bc3984440a2a072d37ad6e57b0276e0202fc131bc2df364548b5ef4c6016b62 SHA512 7a54e68d1bd2c7e58879efd8a55abc5f1b83868dba8c858754870160a538a83dcd8a69736fe4cbc15ebb302640c8fc6ae225908697a5faf114c4c3dc8240b536
+EBUILD nfdump-1.6.14-r1.ebuild 1410 BLAKE2B 54d4138d2e82b72e7dad3202516bfef5ff9fe2fa91134f5b6dd6ad3908e1020e1e2fcab155bef8773b199d9dc91d72efbb399fdd2ff2a928578dccaa827923da SHA512 b6fedee5cb1a65d9b4eb6015c60bbe6206a437fc1b86a39e691d65b9f51ad977232d563bfe764dcb51ef2dd731af5e69770285dc46a2b10ac12662b01934f71f
+EBUILD nfdump-1.6.15-r1.ebuild 1373 BLAKE2B 8c1c3d48ce791f4c33f62425fa6a90b18156d8a034c5acf109f85bd0fe878a4e1a824e6f2a25409b7158732e7b31b3767aeb48f7272ae86582289a753b7c275e SHA512 0ef4aa8adaec70e3ed0d3ad21d0f766203c5f5605ef05cb2456edecc9e56400b148bccf37a0db5c7722a5df140a53cd131af6ee1756cce57925ac213536defc6
+EBUILD nfdump-1.6.16-r1.ebuild 1406 BLAKE2B d9d47205a20738b935bf8b03e7c91d77ec81dd0a74ae52c7e8cf659716855da41e0019b3b1323bc0c8da533e9656e8921382416323679676bde03f2f9e642d78 SHA512 5a36480f8a4030a2739a3a0827c53e9865d462b945923b3c9f709fdfea7a83a3680b16b4ebadcaddf2a1666cd23cef5c9e86ebc1c013eba6707ec30af2eb5f3c
 MISC metadata.xml 1010 BLAKE2B 0f80dce100cf4a9b5b6011b0690b928d149e9430e894cceaf2ae18a37588f8edb81477b2fc70bd2ba1101bb3b4e225dfc7a82d60513dcb5273b7f230727db9d6 SHA512 81abafe5f8da7c40612127765d5b62532168b16d93bd0f0414e8e6c4e86339c8fd77e7ecb4a5b406cf5f33c087f8d2ecd971fdf065c7be0430bd8a095a503c67
diff --git a/net-analyzer/nfdump/nfdump-1.6.14-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.14-r1.ebuild
index 134e2b4a8757..2e8092bab633 100644
--- a/net-analyzer/nfdump/nfdump-1.6.14-r1.ebuild
+++ b/net-analyzer/nfdump/nfdump-1.6.14-r1.ebuild
@@ -7,8 +7,8 @@ inherit autotools eutils
 DESCRIPTION="A set of tools to collect and process netflow data"
 HOMEPAGE="https://github.com/phaag/nfdump"
 SRC_URI="
-	${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${HOMEPAGE}/commit/ff0e855bd1f51bed9fc5d8559c64d3cfb475a5d8.patch -> ${P}-security.patch
+	https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/phaag/nfdump/commit/ff0e855bd1f51bed9fc5d8559c64d3cfb475a5d8.patch -> ${P}-security.patch
 "
 
 LICENSE="BSD"
diff --git a/net-analyzer/nfdump/nfdump-1.6.15-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.15-r1.ebuild
index 86fcde96ecd3..692686c2a06e 100644
--- a/net-analyzer/nfdump/nfdump-1.6.15-r1.ebuild
+++ b/net-analyzer/nfdump/nfdump-1.6.15-r1.ebuild
@@ -6,9 +6,7 @@ inherit autotools eutils
 
 DESCRIPTION="A set of tools to collect and process netflow data"
 HOMEPAGE="https://github.com/phaag/nfdump"
-SRC_URI="
-	${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-"
+SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
diff --git a/net-analyzer/nfdump/nfdump-1.6.16-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.16-r1.ebuild
index f76dd9f58c52..4b6b229dfeba 100644
--- a/net-analyzer/nfdump/nfdump-1.6.16-r1.ebuild
+++ b/net-analyzer/nfdump/nfdump-1.6.16-r1.ebuild
@@ -6,9 +6,7 @@ inherit autotools eutils
 
 DESCRIPTION="A set of tools to collect and process netflow data"
 HOMEPAGE="https://github.com/phaag/nfdump"
-SRC_URI="
-	${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-"
+SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/1.6.15"
diff --git a/net-analyzer/ngrep/Manifest b/net-analyzer/ngrep/Manifest
index aa84c2d558f5..e359c237e51f 100644
--- a/net-analyzer/ngrep/Manifest
+++ b/net-analyzer/ngrep/Manifest
@@ -5,5 +5,5 @@ AUX ngrep-1.47-regex.patch 683 BLAKE2B 5eaed7398a140dee747664ce05c3f9afb9f57f827
 DIST ngrep-1.45.tar.bz2 463361 BLAKE2B 31f7828fb28197f06a583cd6d250b5d70bfbd2bc5dae657daaed3f7ea286aec4dff9cca449c72a3c27d8e8b30d861304872eaaaa11abc9eb71f2acc94d9fc9f2 SHA512 0feb4080f834449d57ae99897c573d2b8148711cfb550fa4ff415169dedb1f0d23f4b03f625660162ca72f8ad06e19874c1af46da6afd8f8fe8dd553558c14f7
 DIST ngrep-1.47.tar.gz 187067 BLAKE2B 4fa47ed343b88e84fb5a3ab6e4dc8139cb008ffcbea901a67664335ad76d36e975e037620cebb1b204ba22e5b139e822c7cfbc74a061fc6cacae631be3f87a52 SHA512 47ba65878df6b555701c866721a8a935eabdcce636d398284cbfe5f63baf68c62d994a2f373ea4fc8f44fbed3eecee149f2ee48d39c71c04d34e5a088db8c657
 EBUILD ngrep-1.45-r3.ebuild 1054 BLAKE2B bfd9bdbaeee4b01ebf2ecb3da4a86799bf4d4731c043b2710d27c51ff957fd5ffca8b909c2818bce8412deceebddd740a93e78798ef7be60ad6ce9be8a7f5e55 SHA512 4cfbb8c069c4b758bb29e87a179c790f2b8c3ed4a8f057944cbf5d7b119b2812cfabb572180027ca4260dec247a7aa1adcad3e02dd6933823d154bc4f8834680
-EBUILD ngrep-1.47.ebuild 970 BLAKE2B 05f6b80a67ba50256456dbca1e14d2a492e30a2472a2c2cd9e645cf0b6dd236240cc0364b970de8872aaec19f79d532a54df3822b5601b2d4eeedc46cfc8e022 SHA512 1542eff1e1a20d00e4844b80421d8d541eaa5655190a5ed147cfe3a635333c627108df77b61158381d804d1b73e113badc5ded484fa2e699a390526a02ad51b1
+EBUILD ngrep-1.47.ebuild 988 BLAKE2B 5631f03e2291665a5dbeb50a4143b02dd1345d4f4a6444fdfb764f1f5383c93fe366a8e187400bd12afe125f94a0108b054b5ebd18bb732dd561d0953d0fc789 SHA512 4db4e6f7204430823aafd035e1df7961e4b8e704c3d855975c1ffd1ea81c4b602feb4b3a256c4d2958e7692a15cf3c59f5722f664f95eb8e5b4f39a41b716fe4
 MISC metadata.xml 669 BLAKE2B 79852bd4c0d1185bcbf60e5ba9e5a9c58b6d6720942cd0cd6d7f8f4f6d445d9ba3fa888bbfba625d1627df4a0aaed22513163075806483a576e199acb9c5fb4d SHA512 d680774ca1d7a66bbe9badb840ebf3f0249c80d0850a229797d17a09da27e2fad9510449ceecfb62b3141ad105fd2970713a14879df57e0bb14c26ac66c807ad
diff --git a/net-analyzer/ngrep/ngrep-1.47.ebuild b/net-analyzer/ngrep/ngrep-1.47.ebuild
index 32d16ec82dd3..69ec0517813c 100644
--- a/net-analyzer/ngrep/ngrep-1.47.ebuild
+++ b/net-analyzer/ngrep/ngrep-1.47.ebuild
@@ -6,7 +6,7 @@ inherit autotools user
 
 DESCRIPTION="A grep for network layers"
 HOMEPAGE="https://github.com/jpr5/ngrep"
-SRC_URI="${HOMEPAGE}/archive/V${PV/./_}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/jpr5/ngrep/archive/V${PV/./_}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ngrep"
 SLOT="0"
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index fc676140a74b..0bbb5424ca2b 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -9,10 +9,12 @@ AUX nmap-7.25-no-FORTIFY_SOURCE.patch 2258 BLAKE2B 28e3dbd2d2ccac4d01fc640377fd8
 AUX nmap-7.31-libnl.patch 498 BLAKE2B 15ba0015ce0c5f266adf1f6b53ad99db82521a3ef8b226f040acc4f0f7759af762fafbce2a1820675e55e04d6b4dfbe04f67711d3fdd1e9dabd750b200ef9d3a SHA512 e7047faaac2bec6c8e0aaae04cbc6e97a8da7999fbb1a8ff015a78ffafe3ce645b71746fd6da826e3ad9baa8d8a917d3791836e67a346dc9c1ca6678cd04e7c8
 AUX nmap-7.70-time.patch 586 BLAKE2B 5354fffebb073c2e96ec744ac746b140ef1b528539faea0ba9423283b2bb535e4310423cbae9671b13ef3af4381182cb61a6662bf314f597cc2fbcaf16b9d11e SHA512 5b948f7393fae98bc0d94e3aef585308476728fe1530fd59bc67aa16ab8f8d790f06b9efa30c9c0a924e690c088453f213520b086ec233a80aa7de8205d79276
 AUX nmap-7.80-ac-config-subdirs.patch 849 BLAKE2B d46ad183900ca2f541a1577a2add5c13cebf97007867e737bd8f2c4d45e0716ddd0a8ea0e193eca17fd26d8f5acc1c2b4cd7166d8ddc1942e75e0adbaca17f01 SHA512 e1c1aee3fc5e0030409b258c7bb8838844c2008cde48457105ae43e6d8dd705672bfba269911807105e0735ff0b25fc86304be9dc4c3dc33b3f722a9c492ecd4
+AUX nmap-9999-constify-continued.patch 801 BLAKE2B a11f5293343ec0d710bfb8648de5b82d5f8d2d10f21e6dcda8ebf963337fedc62248da635b66c956eb64eeb1058b65d4a4ed20e44086c84ae1898fd5c93ff753 SHA512 95f51a1def778ebea9f85a06f3908636b4a849b9e35b027f495da3a37f5293f49046f1f29c778162c8bbb5707e8288a4e37e9362f3310e4fafa238b84ee47af0
+AUX nmap-9999-netutil-else.patch 785 BLAKE2B cfa912b8a31ee26b1c0be2b63e8612794099ea9797a0bfccd56bd6a96b11ff76cb82f9fb4aaae326e845c016d9cf933b431b718b89e14a67c45f7f23d15d1cf0 SHA512 05d61d3ac52b77521fd989ff3f100089ead4af17f1e3654f07b9557b63af92f8a3adc2fccd1be2a4425735018e7f05eda9154c1fe139e3df9d10a874cf418052
 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 4511 BLAKE2B 1a5599df259671c105270d6be62aef9d0da5c707da9ec952eea374cfeddb7674dc49d742a7ef1e895f0a13aead05ddf5c310f258f83fe1305a16d7912a95822d SHA512 03f87c2848fc01424b036006ad4628637c4fe57711b79a8dffa4047c65ab4dd8f19f4612e56334cb0aeb711c2eebe9607f14165abce431c72dec96985b92de81
 EBUILD nmap-7.80.ebuild 4404 BLAKE2B 5b14582a9f8ba7fb1872b18bc7e4f3a12f91cb46ec71a872947f004fc4b1cb018f65d0839cf06d5f153ccd0ab84c36b9ec549d2955cf5e90f5ef02a468f01c13 SHA512 0eadaa7891d91fe15355d0a24694eae1ef31c72899c841a436eb11e34a4200f61144e0916a05891e765fcee6120420b48378fff6e65407c94e00c5f33786baed
-EBUILD nmap-9999.ebuild 4269 BLAKE2B bb6b027fa1ec70811bee19603285f470b58efa83f93bd7d6ff3470363b12731b54b15709b95738a000935cfab04d5866cefafc2ffd0788a3dbeb09f0bb695e9f SHA512 ee859d47d92d21cfe8c0e0bcc24063229eb52ebce081aa6e3b3df420f7ce41e310ba1b21e50573801f728858b449eef0f882ddbc54dc085660f57093d4a62f0e
+EBUILD nmap-9999.ebuild 4365 BLAKE2B 4cefc1c460a5f0988831a3a4f966cf9ba7f235d54deb3a67a444e6b7b5f63a7e8214bfef9c830ec2bde3f7507acf552a15b6dd5c275f8d732ed5fe39d4f62e17 SHA512 5750c06832dac64095e4956c799ce9e93a12632574ed5be759b690fc0c7dff29209302168c28884e0252449aa8ebcf183cfad473ed3a313dcde857ec861e1138
 MISC metadata.xml 920 BLAKE2B c07add545e072588022e15d9de0595f1924fe10fdbec7a11cd401429a76a56ee0a53e4675b3e784f5e2e44372f531073cbdc3da717e4a7f3f906b5c1987530d8 SHA512 56d44c71139e48b75a89140bedd2c4a1bc20c8fe99e16ee8b71fb490cb606997571de95d6ac93147bdee81bbcbb736588c87c43b9cd4f9fac71280416a499185
diff --git a/net-analyzer/nmap/files/nmap-9999-constify-continued.patch b/net-analyzer/nmap/files/nmap-9999-constify-continued.patch
new file mode 100644
index 000000000000..04738f408231
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-9999-constify-continued.patch
@@ -0,0 +1,22 @@
+--- a/libnetutil/EthernetHeader.cc
++++ b/libnetutil/EthernetHeader.cc
+@@ -284,7 +284,7 @@ int EthernetHeader::setEtherType(u16 val){
+ 
+ 
+ /** Returns destination port in HOST byte order */
+-u16 EthernetHeader::getEtherType() const {
++const u16 EthernetHeader::getEtherType() const {
+   return ntohs(this->h.eth_type);
+ } /* End of getEtherType() */
+ 
+--- a/scan_engine.cc
++++ b/scan_engine.cc
+@@ -166,7 +166,7 @@ extern "C" int g_has_npcap_loopback;
+ #endif
+ 
+ 
+-int HssPredicate::operator() (const HostScanStats *lhs, const HostScanStats *rhs) const {
++const int HssPredicate::operator() (const HostScanStats *lhs, const HostScanStats *rhs) const {
+   const struct sockaddr_storage *lss, *rss;
+   lss = (lhs) ? lhs->target->TargetSockAddr() : ss;
+   rss = (rhs) ? rhs->target->TargetSockAddr() : ss;
diff --git a/net-analyzer/nmap/files/nmap-9999-netutil-else.patch b/net-analyzer/nmap/files/nmap-9999-netutil-else.patch
new file mode 100644
index 000000000000..a96a04b7a87f
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-9999-netutil-else.patch
@@ -0,0 +1,20 @@
+--- a/libnetutil/netutil.cc
++++ b/libnetutil/netutil.cc
+@@ -2571,7 +2571,7 @@ const char *ippackethdrinfo(const u8 *packet, u32 len, int detail) {
+ 
+     /* CASE 4: where we (finally!) have a full 20 byte TCP header so we can
+      * safely print all fields */
+-    else { /* if (datalen >= 20) */
++    else if (datalen >= 20) {
+ 
+       /* TCP Flags */
+       p = tflags;
+@@ -2633,7 +2633,7 @@ const char *ippackethdrinfo(const u8 *packet, u32 len, int detail) {
+           (tcpoptinfo[0]!='\0') ? " " : "",
+           tcpoptinfo, ipinfo);
+       }
+-    } else{
++    } else {
+       /* If the packet does not fall into any other category, then we have a
+          really screwed-up packet. */
+       /* This ought to be unreachable; if static analysis flags it as such, delete it. */
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 4c5cd498f494..c45c2c6b4ce3 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -66,6 +66,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.25-libpcre.patch
 	"${FILESDIR}"/${PN}-7.31-libnl.patch
 	"${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
+	"${FILESDIR}"/${PN}-9999-constify-continued.patch
+	"${FILESDIR}"/${PN}-9999-netutil-else.patch
 )
 S="${WORKDIR}/${MY_P}"
 
diff --git a/net-analyzer/nrpe/Manifest b/net-analyzer/nrpe/Manifest
index 05f6d66c164c..9c0f35c6aa3d 100644
--- a/net-analyzer/nrpe/Manifest
+++ b/net-analyzer/nrpe/Manifest
@@ -3,6 +3,6 @@ AUX nrpe.init 1152 BLAKE2B eea4c8554ef02b7eb9e602a4b0750565520dd830435586043f615
 AUX nrpe.service 242 BLAKE2B 715f0e8b91d6c40405d6d1f3689bbbf750e61e78e1d727debbe998ae81922b36f1d5f7c011f6881979e485a81c08d3f1f405b962023fecea643c8f7a9e04c3df SHA512 ffd67467cc4f5ccdf73e0860d1355a8cc3e528d0c67f2054b0ad76c02a43f9c5a8964a3f6df6f91eaa8e15c3c9596259aa964ad69aa2da60678d68fa892b2346
 AUX nrpe.xinetd.2 245 BLAKE2B 3e9db31c7d5b28dab18d2f5855d0465f25fc9cf4a70deac9a5d0c87c7cc546a33b432dbca172a49addadc0bd6583d870ec0fe350bf60e015e325d8bb923aca47 SHA512 d687cb2a5babfd28a97d3a5f1ac665758341ecc37fdd0193dbf0df4cba68c88aa24776a33a706989843fa5356b2e3e995662a823ceb2b86ba8f846f8c47e18fb
 DIST nrpe-3.2.1.tar.gz 518015 BLAKE2B c9be2bf24e3d9977a7ff5c2f0e08bfe841729289af836bb7ac6ccb2c173a519958b12cc3e90ece612ac6c2527ad472ef1464be648a66b11ff8ad483d5ad78cc1 SHA512 ec6ff42a00bd97ed80010a82e26dc35fd419f2feda65820cda0108068173c1ae44eee698833a50fd2079429a6f5eb1321c4f06b09c6708bc5fbe48f176389856
-EBUILD nrpe-3.2.1-r1.ebuild 2486 BLAKE2B a71330ceb27dba3654f6e4923ef4e395e6f831bd2fafe23220e39cdf31aa9d3a898bec0b4ceca4a4a7fee73c76efb69207b4ddb7b264a6af4c0aae84fa2cbc19 SHA512 71e4bf9e5a6ad3f1ff1315d09b84d56b2b5772d7f0627f09c60fa6f63c81ebf1bc89e2980085efb0a9d9a54b8d98846010b5f26c66bfb863f2421cef2c6b0e79
-EBUILD nrpe-3.2.1-r2.ebuild 2476 BLAKE2B db4b5cccb4d03a0a5521b436e1c8d2a668b6a78aa4fe5edab7660711b86c8472ea934bfdc32dd1c81c4d0437aebcc70782d155537472a6d471bac243b94c3cc8 SHA512 d6c95485ba47471893ee641d5594bc688c9991890ee6c12bf03c579b189c2babc7ef17d473ad05610622ef40e0c2c4f34963cd87bba99afb269230829eb91c2a
+EBUILD nrpe-3.2.1-r1.ebuild 2516 BLAKE2B c9221e5f220d7231f9c293a0fbbd5aca68600806538f8dc7bba18c03d1f9d72ab3298ef3098483475212a5f10c2c520ed7fd1914d868b5de2016001b7baf03b5 SHA512 669ba9444ddb021969ec9987fa27bd32bb059410acfdcc344e505cfd562088123fcf227d8bd0d17987670332924fe2dbfd11beaeae146aa49f3cc4a3b8f63348
+EBUILD nrpe-3.2.1-r2.ebuild 2506 BLAKE2B 464ec7948b8771c80b12de47abacd8f4f3326d21e660cd6851e0e7de2ef56b0a4deccf2a34af6ca7c10b06032ad5e0c29f9d2394a269f5732324faf7bbc80310 SHA512 97ed66451767208e94398f6cf7ca86c6e6d2ccf05660d60349e9e8f2713fd28aae6df9f05a8884636baf150b7d6e8985db6547e581c772074f3f4a972319c107
 MISC metadata.xml 770 BLAKE2B 93991f7ee4c1b6c26b67e873fae0cdb66170cd93ba6b79d6e798cb2605126888a996f633eccd038ece2a822d1b92498c2036746bb3a1add2e336c6026c2db86d SHA512 48693abab21581eff977b8deaa5fabc5d388960c9cd090b590a1f6d3c8d37b63fe33ec86d6f95d7435404314b84053f8c2ca84b0f33c6c7241ea7260f82a3a27
diff --git a/net-analyzer/nrpe/nrpe-3.2.1-r1.ebuild b/net-analyzer/nrpe/nrpe-3.2.1-r1.ebuild
index 42a98a8d1eed..3b3a1932e211 100644
--- a/net-analyzer/nrpe/nrpe-3.2.1-r1.ebuild
+++ b/net-analyzer/nrpe/nrpe-3.2.1-r1.ebuild
@@ -6,7 +6,7 @@ inherit systemd user
 
 DESCRIPTION="Nagios Remote Plugin Executor"
 HOMEPAGE="https://github.com/NagiosEnterprises/nrpe"
-SRC_URI="${HOMEPAGE}/releases/download/${P}/${P}.tar.gz"
+SRC_URI="https://github.com/NagiosEnterprises/nrpe/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/net-analyzer/nrpe/nrpe-3.2.1-r2.ebuild b/net-analyzer/nrpe/nrpe-3.2.1-r2.ebuild
index 430050c49b14..7838b676b308 100644
--- a/net-analyzer/nrpe/nrpe-3.2.1-r2.ebuild
+++ b/net-analyzer/nrpe/nrpe-3.2.1-r2.ebuild
@@ -6,7 +6,7 @@ inherit systemd user
 
 DESCRIPTION="Nagios Remote Plugin Executor"
 HOMEPAGE="https://github.com/NagiosEnterprises/nrpe"
-SRC_URI="${HOMEPAGE}/releases/download/${P}/${P}.tar.gz"
+SRC_URI="https://github.com/NagiosEnterprises/nrpe/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/net-analyzer/nstats/Manifest b/net-analyzer/nstats/Manifest
index aafa9409bedc..5ee16967a107 100644
--- a/net-analyzer/nstats/Manifest
+++ b/net-analyzer/nstats/Manifest
@@ -3,4 +3,5 @@ AUX nstats-0.4-makefile.patch 611 BLAKE2B a876d89f3ecc8c7dddf8ef5b83342bad300acd
 AUX nstats-0.4-tinfo.patch 469 BLAKE2B f75ad2c31a66a30c3bbf2cd667a60914289e228ef7a356132f6d5abb93e40c9786bdbf99e2899f735c3c78ed0c87de3a8c30ff363678174de4af8155898d7e8d SHA512 e7c99f91adacd33222f1f9c4fa1b0b342dfc8309a459b9239eb099f1a79972a3065d76560df0b0455c20f994c343f43b5be55de0464031f064c03b4e1dfba843
 DIST nstats-0.4.tar.gz 71526 BLAKE2B bc9e4baab1c425d1248b8669a598f85843465c62a3990ea8ea99f979bee9be8eb351111e58b0ece4748b3e199278acd4f0a06ddde2b4cd6e55ca9ff99096e7e8 SHA512 89e88eb0f707cb125fbf02bef93a0bbbd1409f3516d4b333e06d0a3ffe42f5e8d2b655fa6c7a0c63b7d71c7a2f74f6207e5ed158f7d102f6d47ac6e436da3315
 EBUILD nstats-0.4-r2.ebuild 666 BLAKE2B aea120694a33f74267346fdb635a6282e612aa100be0cecefde4ac906190ec1c6a27f0bca9bd195ad1aef9127f1465dc2b36c744892d9a68dd9525119aabb4cd SHA512 638b36ecf53a9f6f7bf906af617f98e71719d61b6b00260873220da5d8a6bbaea164541492f2b46a7d06399dba90a925b22de75d1d9ed48fc51eb26a408c1e82
+EBUILD nstats-0.4-r3.ebuild 660 BLAKE2B e8b1dd38e7e2741d8829ac5fd687d6a7d0f6f1bffa77b26f7889ef2169078c8a5afb1a83c05665971a4b7391144d1557904bea1cc4123ff8eb24a69b8a3c39be SHA512 35ae27c5489b92952ca950775d91819af385ed5335d184489acca21339bca3114eba83c244cee8b7bbc3eb6721a0253b76c1d72396f638a74234d497678af433
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/nstats/nstats-0.4-r3.ebuild b/net-analyzer/nstats/nstats-0.4-r3.ebuild
new file mode 100644
index 000000000000..06b4455c4cf1
--- /dev/null
+++ b/net-analyzer/nstats/nstats-0.4-r3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Displays statistics about ethernet traffic including protocol breakdown"
+SRC_URI="http://trash.net/~reeler/nstats/files/${P}.tar.gz"
+HOMEPAGE="http://trash.net/~reeler/nstats/"
+LICENSE="Artistic"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	net-libs/libpcap
+	sys-libs/ncurses
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-glibc24.patch
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-tinfo.patch
+)
+DOCS=( BUGS doc/TODO doc/ChangeLog )
+
+src_prepare(){
+	default
+
+	eautoreconf
+}
diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index a71221525b18..f71c1090b477 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -1,19 +1,13 @@
-AUX ntopng-2.4-cxx.patch 809 BLAKE2B b142cddf5a76e6683c1220aaed4293d0a90cb2d67b2d446600faec2881c4d8b2ec4d41c247f9301b29ef2e94cedb9f12722cc5442f1e2b139b949143c2944fa1 SHA512 04345262208bc0a6043b83ae94a1fa83a08889f19e5d36e68cca5d11c93f12b026e6179c37aa27fb800a6f019b9eba58055920fcc555f2f9627dc8ee6c0e39ee
-AUX ntopng-2.4-dont-build-ndpi.patch 387 BLAKE2B a429abdf9acf6111aa44c5cd26818f1f3f86abd37323113a828d83772b81e42ccda9fe32491c005fddb04f7effc77371812e8a76465f9a3c343c05f3956aa12e SHA512 5e16fc3dcaa7e69802bf94dfd4f63903d07d1cdbd119fde483b01134af4542ef84ba3a14cfa61921f7e924b64d7bb191a8818d7bece21c726c8f5e3876ccc98d
-AUX ntopng-2.4-mysqltool.patch 430 BLAKE2B 052163786435b54d527e01a9e13fc385795f6c9895310bd084d3906307fe36247a549128284a6249dd1034f87a7f138370567fb64b16ae4c1d8b624ca08da204 SHA512 9ade5fb4e8a9f9b205327d482670b87fa249ab375be3414801e46ac34f1204605be4530326836b1ded48e9a63f38d0fecaf047cde09650e380495257a0e0832a
-AUX ntopng-3.0-gentoo.patch 1596 BLAKE2B 36349887ae8f418a0db67d8a96d33785fe5ec4875a987fa9b837857b1cbbdcaa802d2c5b2524b6edeb8cda5aaeec69102f4facd177d43bc321ed50de62135728 SHA512 fcab6670255d7c756694091d6b53a7880a74e8840fa8f77ec81b072dbe7c7a5ec5b4550892dc78c45304ee437a309fe8c79293f6205c570685b8f13178c1c306
-AUX ntopng-3.0-mysqltool.patch 430 BLAKE2B 94410cdac37f6d35b4c6b0f90c3391f79d36242932af2ab520a8db3057b37b3d059fd708e0af930bf8321babadade61621f79f77ac55581ebe46555e6cd9e6c6 SHA512 82b06a14f471bd037743a7563a80d6460e63ff262252d0318e40ba25bf8da849bc0394a5fa4d54befd5df6bd4b645b86711708198f8971d54eb15e8f32c83cd5
-AUX ntopng-3.0-pointer-cmp.patch 340 BLAKE2B 2b361ac6fc25857125b192fab11cb1c060bef6fb220386ffaf5b3df68ee5f52e173fc63e3a70175d746df52ae258bb2fd01ab6b3888ccfd320700083540ab0e7 SHA512 30e0137046c5612d627c3efb7a17b303a04144e63dc14e3ffd393cd87444b623af6430a6520181e5cf3fef5e89e51594c9700306bba1ffea2a9e6795e7c5e861
 AUX ntopng-3.8-missing-min.patch 567 BLAKE2B 06cff6608d9d8d2fb2312aef0075d53f2e1c19f6294bc47f2b26b6aa27d078edfc78b16142ea13c3e6a679ba541dcb2185b82af4969e621454fa97566a68e6e5 SHA512 567cea5b632b9a2d405cfb8058ef1ec204506084286ba4d7e86b64939a0ab7b3bd1204473a194ab7cf16195e76abcd4b77a05c20b1516cdbc59f431feb5cec16
 AUX ntopng-3.8-mysqltool.patch 437 BLAKE2B 13df7c163168b59917843a2c7dee13f41c6d3b95e16a0967c849771dbb552c72f1d5e8d16dd76ed6b51c149a1143707d432761abd907bec3d7b6257a099debca SHA512 f13a6d529e2e2d659763c2ec013ebdb61f3b741d242f375345e60e66d7cf4adeefdff6876d3a15497fc9b2f1966268665e550719f7bd86ca1b44252f459c9029
 AUX ntopng-3.8-ndpi-call.patch 507 BLAKE2B b08c95e8a35c7372b1fc56bf59a50a8ba22091e86051ea2843f6833b41faaa0022d79e462f9755c3234bd3641facbec7a6a2689eb5ee66ee3b4b3df6abcaf29c SHA512 88c3fc0b3f82fda730e614c85a3366392a557140122d98d21e9dc24b2e43123d557636206e18f09117dccb9c1da8a1ccce49293d2261f00f78e3b1523f70ba0e
-AUX ntopng-3.8-ndpi-includes.patch 528 BLAKE2B c8a874f83aae75b0691ea9c9eeaaaeaac021de9f2e1d7a1bc1024acf927c36449d13df022ea6df5c2f09af68628aee5adef9039db5f7a3d6aa36da6c9d7924fa SHA512 593923665752322207bde864850bdfca7d1f75ea1270f1abd514b648f0fe6a539f4925837bebf433a3ffc82ae60edaafeaeaca2e19a58e87459e6caea245e59b
+AUX ntopng-3.8-ndpi-includes.patch 456 BLAKE2B 517864615e89088aafdd21c50d550e8991387120252126a9bde7531bc0ac6f9691e69e8ae38db4a623e0f6d6161b2f780dd304be377c90c2cf8a1caf20100e0e SHA512 5033c87fdf3fc32539db886a9675bf69dd71aab22ee8d3357f8f700198ba15a69bf4d4f633941b2c806dcf7ad866b9d18373d02a76ffcfea56b6ebe6e22a82ee
+AUX ntopng-3.8.1-PKG_CONFIG.patch 3059 BLAKE2B e11205bf3e6dcfa5fd00860b42f6f55046b160f3f607952a510a462966e52f878a8e7cbafbb684dbf1a7a715e2fa2cabd22dc51f90332de5404a724e97c9ecbc SHA512 e5498a81edf664269a44e5f9d776938ae12f2ff8a611570d5923ba23fbfb69e23cfead2311357e4528996c189853cf7fdb307d9c307bff0f9f4309fd4591ee3a
+AUX ntopng-3.8.1-parallel-make.patch 267 BLAKE2B f68ab75b32b3275b5513039f947f1dc8ca1f4b3642730cba5ff461ebaa6c9114fe238574087bf4a4f1be91b31954e1d17dcaf535709714c2fc5a04ef10bfd0b1 SHA512 ade7e22747cb750bc5f7d4a3480c003414f99d39401e0bcfe1c3d0b58cb2c409f962d58becc3c6c40a5b95d057fe5b4dfeb9cfd0855a30b4c5be1d26ba3c0e62
 AUX ntopng.conf.d 117 BLAKE2B 67e2962fcb0303ab465b3d8def04192992e3e7306c5e76084a58cca5bdf1a797b08193f2a3512f876ff9c5300b0f3504055e7166afcbb4cbc527658c74b0616b SHA512 bb66d11245ce099f9e09f97d830da60df910682242db0c5c7d17bcd800e84cf3bce6288fb75fc3a8f3e214a580dc0d076f7f69aa924d9ad3e4c8bff093252061
 AUX ntopng.init.d 549 BLAKE2B de561950f001e35a26b522728affa5971d8a0fdd1d855746509c0e6861df7ed9c356abe6bc066df65524c340d05c072e7c4de0864c250164b8a1509b34d508c0 SHA512 1fbcc46fe10dcef82a1310d74c4351c72752cdd2a9b9908705c8c645698430e456f1ba14b77fd7c1f374a237a508c2d33324de61f5f1f8255ed75a384e874d84
-DIST ntopng-2.4.tar.gz 134074662 BLAKE2B dbf654e5cd1f9eddb5ae325bdf0ac2e7ce22c08f55363b10723bde2cb5fd86cf3b0c7fef0f55dc7fcce0341f5fbb9a7132f26e29649bcf66020b640975c0e6da SHA512 515dd7889ae3aaf2482371bb2c55ab7300cf4207fe07f37029b7529bfb710379c19a54f58cf6df87e42454c0c99d15291af334adff676252301d9edd0acf3c7a
-DIST ntopng-3.0.tar.gz 23017655 BLAKE2B f791690118a5ecfb1be5ad791229f2438354a0c2271350aa1a2f0fee05886c54d181a669e6e1b27657c5bfe4b68db24b06d91adfb89e803a154a7a4bbff146b7 SHA512 d5e310d5dba7fe696d38d9d8251ffa4077182200e41c3f0b6034e68cf6623220ec47ba9d9fd5d2392a7b65a6de770e330821169c7ec06b4952f68c3f5f738eb1
+DIST ntopng-3.8.1.tar.gz 33914341 BLAKE2B 3b0df382e938af78d10e71282e863ccb7ba1da3dc7e2bf90b45f1e6e4670052a8c61a16cb8547f119f0dc753a2e31273b41f40aa26919480cbaecf43b6d59742 SHA512 4cb613881e36b435f97dcc25dfaa505d9c552f63ad8334d5c9d47ec06376d47124c65e6d782546d36f6d27b34b037cc73df7129f459f290ac51e270bb7453970
 DIST ntopng-3.8.tar.gz 33910329 BLAKE2B a5aaed2244516b92e4b8c7364817ea66eb2f446fe814a96622cbbf5d851d79e8049b75da009d0f80f07c1fae90f8dc294794b76ed14450d8e0e6685a1b1ce8f2 SHA512 2236f9931fc606e4d0a6da379c480a48bacd441cf199a310ea690a03d74d08f369825ea02e3c13828a10f716a5531d4e6774876f253ab348a52bcf8bd8d5107f
-EBUILD ntopng-2.4-r1.ebuild 1713 BLAKE2B 412ffa5d8596bf4f2d5701864cc12a542c13442c99c3652d8df3790f0aec24b2d8f3d151c7b560d492c2f74ba6dc1b1b24358cb7e9b22ee26d89ca14032108b5 SHA512 a5a42e0f4de1feefd5cfc8c407b375ce9b5587568de90f5fbc2e4c3f53c08df6f645e5abd95eddd6edb136f519bf3b56b8107298e0fb6e126d0f9bc286946a15
-EBUILD ntopng-3.0-r4.ebuild 1622 BLAKE2B 1db14760398455995b4584065665032b2304d0e5699001e9ee7727bb0cf31272422e8de56b9aa5ec1778d27419f60ad38008b248114fbd49781229de38ac546e SHA512 e2591cd2c833021f08e45c5ae24843deef9ca7d745e68462618592a2205df3e341c76361bc9046d8d0797d515b099f2139e889bc4caa5a1f42996ed6154dffa2
-EBUILD ntopng-3.8.ebuild 1727 BLAKE2B c95da883fdd8b8e9828345248d8dea86f7a326e799e1ec413e06f32eeb620efc45a20ab93a7c005307c5877ef5285a368db4dc1fa9b15c7c480e5775c15ea3f6 SHA512 3a04bfdf57bec06b39a470692a319f38d9204a0e88e63b4a02b16c2da5caf16a0639a8ced42a4f1de42e3651ea657a5b22eb4674180049c3cafcae89eb56fb39
-MISC metadata.xml 299 BLAKE2B 466c255eb9dd221bc91a9308a7ad2d4032c96072f96220d56f78f8c2e9f79392a83603e7bd3a78e4bfa32bd61b04351261ccc86dc82ca9d834c2afc73724ed19 SHA512 5c8e5b8f97b306a059913e2adc9e02137502ec35da1a753a2b9af4d4c67c0af0f0266c14acdd488c89bb96da3cc0464512de05ce389055d35bc6a0feab7ac996
+EBUILD ntopng-3.8-r1.ebuild 1729 BLAKE2B da6fc2d159813ca2505dae2bc82038fcc7831768adf03d2cbce74ef7ee9fc8268953819641015e0a98550b3ef19e7f42cb63da7c19e6e0f1edf6139f0326165c SHA512 3d71d06d03a0bb2c67be93701cb5a13058d50b029bc1a9f80d630fc687742dbfc7054be34a73c9c4f2f457c44692cec076b4d627a8f6d8b02d06352a4921d39e
+EBUILD ntopng-3.8.1-r2.ebuild 1912 BLAKE2B 9e073878fe2fcea73878b783abe608c899733975463d3e277cffae2abc285ba296c733a055ea7076ac1c09f57c0a5a9f725dc690d0ad0d810f0fa5571a83d028 SHA512 47d0bf663096213abda2f19ec71f730551ded735321cf8c7bde23949128a62c58f99e4e1fefcc3db63906f0b8390fb81c5850db8392cc350e0ee9d2e7fd36bf4
+MISC metadata.xml 294 BLAKE2B 8576bdc8fbbdbeb8502b8d8fb59b71b02d8e99c67d1262ce17ff3cd711ef4c7a7c9234c02503401aa861103ed136c397bf585e94902e13902db490fe55e9e5a4 SHA512 67820c7c2d32de9c79854059df9bad9444a6ef70cca8c718b5469035ce2dd1bf2242b332482b5a12d8f1eaba37ae905f483daf5ba929219c9e6ac3f108c3bc73
diff --git a/net-analyzer/ntopng/files/ntopng-2.4-cxx.patch b/net-analyzer/ntopng/files/ntopng-2.4-cxx.patch
deleted file mode 100644
index 6de1a43f9b8e..000000000000
--- a/net-analyzer/ntopng/files/ntopng-2.4-cxx.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -341,14 +341,6 @@
- 	GMAKE="make"
- fi
- 
--GPP=`which clang++`
--if test x$GPP = x
--then
--	GPP="g++"
--else
--	GPP="$GPP -O0"
--fi
--
- GIT=`which git`
- if test x$GIT = x
- then
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -4,7 +4,6 @@
- SHELL=/bin/sh
- OS := $(shell uname -s)
- PWD=@PWD@
--GPP=@GPP@
- INSTALL_DIR=$(DESTDIR)$(prefix)
- MAN_DIR=$(DESTDIR)@MAN_DIR@
- 
-@@ -126,12 +125,12 @@
- 	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
- 
- %.o: %.cpp $(HEADERS) Makefile
--	$(GPP) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
- 
- .PRECIOUS: $(TARGET) $(OBJECTS)
- 
- $(TARGET): $(OBJECTS) $(LIBRRDTOOL) Makefile
--	$(GPP) $(OBJECTS) -Wall $(LIBS) -o $@
-+	$(CXX) $(OBJECTS) $(CXXFLAGS) $(CPPFLAGS) -Wall $(LIBS) -o $@
- 
- $(LUAJIT_LIB):
- 	cd $(LUAJIT_HOME); @GMAKE@
diff --git a/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch b/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch
deleted file mode 100644
index ef40c72d5896..000000000000
--- a/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -62,13 +62,6 @@
- fi
- 
- NDPI_LIB=$NDPI_HOME/src/lib/.libs/libndpi.a
--AC_MSG_CHECKING(for $NDPI_LIB)
--if test -f "$NDPI_LIB" ; then :
--  AC_MSG_RESULT(found $NDPI_LIB)
--else
--  AC_MSG_RESULT(not found $NDPI_LIB: compiling)
--  cd $NDPI_HOME; ./autogen.sh; make; cd -
--fi
- 
- AC_MSG_CHECKING(for ntopng professional edition)
- if test -d "pro"; then :
diff --git a/net-analyzer/ntopng/files/ntopng-2.4-mysqltool.patch b/net-analyzer/ntopng/files/ntopng-2.4-mysqltool.patch
deleted file mode 100644
index a80e966b85de..000000000000
--- a/net-analyzer/ntopng/files/ntopng-2.4-mysqltool.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -302,13 +302,7 @@
- if test "x$ac_cv_prog_ac_ct_MARIADB" = "xmariadb_config"; then
-    MYSQLTOOL="mariadb_config"
- else
--   PATH=$PATH:/usr/local/mysql/bin
--   AC_CHECK_TOOL(MYSQL, mysql_config)
--   if test "x$ac_cv_prog_ac_ct_MYSQL" = "xmysql_config"; then
--     MYSQLTOOL="mysql_config"
--   else
--     MYSQLTOOL=""
--   fi
-+   MYSQLTOOL="mysql_config"
- fi
- 
- if test -n "$MYSQLTOOL"; then
diff --git a/net-analyzer/ntopng/files/ntopng-3.0-gentoo.patch b/net-analyzer/ntopng/files/ntopng-3.0-gentoo.patch
deleted file mode 100644
index 90d7aace545c..000000000000
--- a/net-analyzer/ntopng/files/ntopng-3.0-gentoo.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -19,7 +19,6 @@
- # On CentOS 6 `git rev-list HEAD --count` does not work
- #
- #
--REVISION=`git log --pretty=oneline | wc -l`
- 
- if test -d "/usr/local/include"; then
- CFLAGS="${CFLAGS} -I/usr/local/include"
-@@ -48,33 +47,6 @@
- 
- SHORT_MACHINE=`uname -m | cut -b1-3`
- 
--GIT_RELEASE="@GIT_RELEASE@"
--GIT_DATE="@GIT_DATE@"
--GIT_BRANCH="@GIT_BRANCH@"
--PRO_GIT_RELEASE="@PRO_GIT_RELEASE@"
--PRO_GIT_DATE="@PRO_GIT_DATE@"
--
--AC_MSG_CHECKING(for nDPI)
--NDPI_HOME=./nDPI
--if test -d "$NDPI_HOME" ; then :
--   AC_MSG_RESULT(found in $NDPI_HOME)
--else
--   NDPI_HOME=../nDPI
--   if test -d "$NDPI_HOME"; then :
--      AC_MSG_RESULT(found in $NDPI_HOME)
--   else
--      NDPI_HOME=$HOME/nDPI
--      if test -d "$NDPI_HOME"; then :
--        AC_MSG_RESULT(found in $NDPI_HOME)
--      else
--        AC_MSG_RESULT(not found)
--        echo "Please do cd ..; git clone https://github.com/ntop/nDPI.git; cd nDPI; ./autogen.sh; make; cd ../ntopng"
--        echo " and try again"
--        exit
--      fi
--   fi
--fi
--
- if test -d "/usr/include/openssl"; then :
-  AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl])
-  SSL_INC="`pkg-config --cflags libssl` -I/usr/include/openssl"
-@@ -53,15 +53,6 @@
-  SSL_LIB="`pkg-config --libs libssl` -lssl -lcrypto"
- fi
- 
--NDPI_LIB=$NDPI_HOME/src/lib/.libs/libndpi.a
--AC_MSG_CHECKING(for $NDPI_LIB)
--if test -f "$NDPI_LIB" ; then :
--  AC_MSG_RESULT(found $NDPI_LIB)
--else
--  AC_MSG_RESULT(not found $NDPI_LIB: compiling)
--  cd $NDPI_HOME; ./autogen.sh; make; cd -
--fi
--
- AC_MSG_CHECKING(for ntopng professional edition)
- PRO_MAKEFILE_INC=
- PRO_INC=
diff --git a/net-analyzer/ntopng/files/ntopng-3.0-mysqltool.patch b/net-analyzer/ntopng/files/ntopng-3.0-mysqltool.patch
deleted file mode 100644
index 4d2244b582b9..000000000000
--- a/net-analyzer/ntopng/files/ntopng-3.0-mysqltool.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -335,13 +335,7 @@
- if test "x$ac_cv_prog_ac_ct_MARIADB" = "xmariadb_config"; then
-    MYSQLTOOL="mariadb_config"
- else
--   PATH=$PATH:/usr/local/mysql/bin
--   AC_CHECK_TOOL(MYSQL, mysql_config)
--   if test "x$ac_cv_prog_ac_ct_MYSQL" = "xmysql_config"; then
--     MYSQLTOOL="mysql_config"
--   else
--     MYSQLTOOL=""
--   fi
-+   MYSQLTOOL="mysql_config"
- fi
- 
- if test -n "$MYSQLTOOL"; then
diff --git a/net-analyzer/ntopng/files/ntopng-3.0-pointer-cmp.patch b/net-analyzer/ntopng/files/ntopng-3.0-pointer-cmp.patch
deleted file mode 100644
index 171bee36e897..000000000000
--- a/net-analyzer/ntopng/files/ntopng-3.0-pointer-cmp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/AddressResolution.cpp
-+++ b/src/AddressResolution.cpp
-@@ -52,7 +52,7 @@
-   u_int numeric_ip_len;
- 
-   snprintf(query, sizeof(query), "%s", _numeric_ip);
--  if((at = strchr(query, '@')) != '\0') at[0] = '\0';
-+  if((at = strchr(query, '@')) != NULL) at[0] = '\0';
-   numeric_ip = query;
-   numeric_ip_len = strlen(numeric_ip)-1;
- 
diff --git a/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch b/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch
index 068f1e9fa9b9..cdd5e827147c 100644
--- a/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch
+++ b/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch
@@ -1,5 +1,5 @@
---- a/configure.seed	2018-10-08 21:33:09.403001834 -0600
-+++ b/configure.seed	2018-10-08 21:35:47.404002203 -0600
+--- a/configure.seed
++++ b/configure.seed
 @@ -129,9 +129,9 @@
  fi
  
diff --git a/net-analyzer/ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch b/net-analyzer/ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch
new file mode 100644
index 000000000000..91811d66bbd4
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch
@@ -0,0 +1,95 @@
+--- a/configure.seed
++++ b/configure.seed
+@@ -6,6 +6,8 @@
+ 
+ AC_PROG_CXX
+ 
++PKG_PROG_PKG_CONFIG
++
+ dnl> Add /usr/local/ /opt/local
+ CFLAGS="-I${PWD} -I${PWD}/include"
+ CPPFLAGS="${CPPFLAGS} -I${PWD} -I${PWD}/include"
+@@ -179,10 +179,10 @@
+ fi
+ dnl finish: nDPI handling
+ 
+-if test -z `pkg-config --exists libssl`; then
++if ${PKG_CONFIG} --exists libssl; then
+  AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl])
+- SSL_INC="`pkg-config --cflags libssl` -I/usr/include/openssl"
+- SSL_LIB="`pkg-config --libs libssl` -lssl -lcrypto"
++ SSL_INC="`${PKG_CONFIG} --cflags libssl` -I/usr/include/openssl"
++ SSL_LIB="`${PKG_CONFIG} --libs libssl` -lssl -lcrypto"
+ fi
+ 
+ AC_MSG_CHECKING(for ntopng professional edition)
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -44,10 +44,10 @@
+ 
+ ######
+ LIBRRDTOOL_HOME=${PWD}/third-party/rrdtool-1.4.8
+-HAS_LIBRRDTOOL=$(shell pkg-config --atleast-version=1.4.8 librrd; echo $$?)
++HAS_LIBRRDTOOL=$(shell $(PKG_CONFIG) --atleast-version=1.4.8 librrd; echo $$?)
+ ifeq ($(HAS_LIBRRDTOOL), 0)
+-	LIBRRDTOOL_INC = $(shell pkg-config --cflags librrd)
+-	LIBRRDTOOL_LIB = $(shell pkg-config --libs librrd) # -lrrd_th
++	LIBRRDTOOL_INC = $(shell $(PKG_CONFIG) --cflags librrd)
++	LIBRRDTOOL_LIB = $(shell $(PKG_CONFIG) --libs librrd) # -lrrd_th
+ else
+ 	LIBRRDTOOL_INC=-I$(LIBRRDTOOL_HOME)/src/
+ 	ifeq ($(OS), $(filter $(OS), OpenBSD FreeBSD))
+@@ -70,10 +70,10 @@
+ 
+ ######
+ 
+-HAS_JSON=$(shell pkg-config --exists json-c; echo $$?)
++HAS_JSON=$(shell $(PKG_CONFIG) --exists json-c; echo $$?)
+ ifeq ($(HAS_JSON), 0)
+-	JSON_INC = $(shell pkg-config --cflags json-c)
+-	JSON_LIB = $(shell pkg-config --libs json-c)
++	JSON_INC = $(shell $(PKG_CONFIG) --cflags json-c)
++	JSON_LIB = $(shell $(PKG_CONFIG) --libs json-c)
+ else
+ 	JSON_HOME=${PWD}/third-party/json-c
+ 	JSON_INC=-I$(JSON_HOME)
+@@ -83,21 +83,21 @@
+ ######
+ 
+ ifeq (@NEDGE@, 0)
+- HAS_SODIUM=$(shell pkg-config --exists libsodium; echo $$?)
++ HAS_SODIUM=$(shell $(PKG_CONFIG) --exists libsodium; echo $$?)
+  ifeq ($(HAS_SODIUM), 0)
+-	SODIUM_INC = $(shell pkg-config --cflags libsodium)
+-	SODIUM_LIB = $(shell pkg-config --libs libsodium)
++	SODIUM_INC = $(shell $(PKG_CONFIG) --cflags libsodium)
++	SODIUM_LIB = $(shell $(PKG_CONFIG) --libs libsodium)
+  else
+ 	SODIUM_INC=
+ 	SODIUM_LIB=
+  endif
+ 
+- HAS_ZEROMQ=$(shell pkg-config --exists libzmq; echo $$?)
++ HAS_ZEROMQ=$(shell $(PKG_CONFIG) --exists libzmq; echo $$?)
+  ifeq ($(HAS_ZEROMQ), 0)
+-	ZEROMQ_INC = $(shell pkg-config --cflags libzmq)
++	ZEROMQ_INC = $(shell $(PKG_CONFIG) --cflags libzmq)
+ 	ZMQ_STATIC=/usr/local/lib/libzmq.a
+ 	ifeq ($(wildcard $(ZMQ_STATIC)),)
+-		ZEROMQ_LIB = $(shell pkg-config --libs libzmq)
++		ZEROMQ_LIB = $(shell $(PKG_CONFIG) --libs libzmq)
+ 	else
+ 		ZEROMQ_LIB = $(ZMQ_STATIC)
+ 	endif
+@@ -107,9 +107,9 @@
+ 	ZEROMQ_LIB=$(ZEROMQ_HOME)/.libs/libzmq.a
+  endif
+ 
+- HAS_ZSTD=$(shell pkg-config --exists libzstd; echo $$?)
++ HAS_ZSTD=$(shell $(PKG_CONFIG) --exists libzstd; echo $$?)
+  ifeq ($(HAS_ZSTD), 0)
+-	ZSTD_LIB = $(shell pkg-config --libs libzstd)
++	ZSTD_LIB = $(shell $(PKG_CONFIG) --libs libzstd)
+  endif
+ endif
+ 
diff --git a/net-analyzer/ntopng/files/ntopng-3.8.1-parallel-make.patch b/net-analyzer/ntopng/files/ntopng-3.8.1-parallel-make.patch
new file mode 100644
index 000000000000..9089c0a9b04d
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-3.8.1-parallel-make.patch
@@ -0,0 +1,15 @@
+--- a/configure.seed
++++ b/configure.seed
+@@ -526,11 +520,7 @@
+ 
+ AC_DEFINE_UNQUOTED(_CRT_SECURE_NO_WARNINGS, 1, [Disable warning on windows])
+ 
+-GMAKE=`which gmake`
+-if test x$GMAKE = x
+-then
+-	GMAKE="make"
+-fi
++GMAKE='$(MAKE)'
+ 
+ GIT=`which git`
+ if test x$GIT = x
diff --git a/net-analyzer/ntopng/metadata.xml b/net-analyzer/ntopng/metadata.xml
index 334443b640d6..f31113c67cca 100644
--- a/net-analyzer/ntopng/metadata.xml
+++ b/net-analyzer/ntopng/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
+<maintainer type='project'>
+<email>netmon@gentoo.org</email>
+</maintainer>
   <upstream>
     <remote-id type="github">ntop/ntopng</remote-id>
   </upstream>
diff --git a/net-analyzer/ntopng/ntopng-2.4-r1.ebuild b/net-analyzer/ntopng/ntopng-2.4-r1.ebuild
deleted file mode 100644
index 3e53ff545180..000000000000
--- a/net-analyzer/ntopng/ntopng-2.4-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils user toolchain-funcs
-
-DESCRIPTION="Network traffic analyzer with web interface"
-HOMEPAGE="https://www.ntop.org/"
-SRC_URI="mirror://sourceforge/ntop/${PN}/${P}-stable.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-db/sqlite:3
-	dev-python/pyzmq
-	dev-lang/luajit:2
-	dev-libs/json-c:=
-	dev-libs/geoip
-	dev-libs/glib:2
-	dev-libs/hiredis
-	dev-libs/libxml2
-	net-analyzer/rrdtool
-	net-libs/libpcap
-	net-misc/curl
-	dev-db/mysql-connector-c
-	!net-libs/nDPI"
-RDEPEND="${DEPEND}
-	dev-db/redis"
-
-S="${WORKDIR}/${P}-stable"
-
-src_prepare() {
-	cat "${S}/configure.seed" | sed "s/@VERSION@/${PV}/g" | sed "s/@SHORT_VERSION@/${PV}/g" > "${S}/configure.ac"
-	epatch "${FILESDIR}/${P}-dont-build-ndpi.patch"
-	epatch "${FILESDIR}/${P}-mysqltool.patch"
-	epatch "${FILESDIR}/${P}-cxx.patch"
-	sed -i 's/exit$/exit 1/g' "${S}/configure.ac" "${S}/nDPI/configure.ac"
-	eautoreconf
-
-	cd "${S}/nDPI"
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC CXX LD NM OBJDUMP PKG_CONFIG
-	cd "${S}/nDPI"
-	econf
-	cd "${S}"
-	econf
-}
-
-src_compile() {
-	cd "${S}/nDPI"
-	emake
-
-	cd "${S}"
-	emake
-}
-
-src_install() {
-	SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}"
-	dodir ${SHARE_NTOPNG_DIR}
-	insinto ${SHARE_NTOPNG_DIR}
-	doins -r httpdocs
-	doins -r scripts
-
-	exeinto /usr/bin
-	doexe ${PN}
-	doman ${PN}.8
-
-	newinitd "${FILESDIR}/ntopng.init.d" ntopng
-	newconfd "${FILESDIR}/ntopng.conf.d" ntopng
-
-	dodir "/var/lib/ntopng"
-	fowners ntopng "/var/lib/ntopng"
-}
-
-pkg_setup() {
-	enewuser ntopng
-}
-
-pkg_postinst() {
-	elog "ntopng default creadential are user='admin' password='admin'"
-}
diff --git a/net-analyzer/ntopng/ntopng-3.8.ebuild b/net-analyzer/ntopng/ntopng-3.8-r1.ebuild
index adb578b7ff8b..37e007de41ea 100644
--- a/net-analyzer/ntopng/ntopng-3.8.ebuild
+++ b/net-analyzer/ntopng/ntopng-3.8-r1.ebuild
@@ -24,7 +24,7 @@ DEPEND="dev-db/sqlite:3
 	dev-libs/libmaxminddb
 	net-analyzer/rrdtool
 	net-libs/libpcap
-	>=net-libs/nDPI-2.4
+	>=net-libs/nDPI-2.4:=
 	net-misc/curl
 	sys-libs/binutils-libs
 	dev-db/mysql-connector-c:="
diff --git a/net-analyzer/ntopng/ntopng-3.0-r4.ebuild b/net-analyzer/ntopng/ntopng-3.8.1-r2.ebuild
index 2a126bff0473..fb5e82a01945 100644
--- a/net-analyzer/ntopng/ntopng-3.0-r4.ebuild
+++ b/net-analyzer/ntopng/ntopng-3.8.1-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit autotools user toolchain-funcs
 
 DESCRIPTION="Network traffic analyzer with web interface"
@@ -12,37 +12,65 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="dev-db/sqlite:3
-	dev-python/pyzmq
-	dev-lang/luajit:2
-	dev-libs/json-c:=
-	dev-libs/geoip
-	dev-libs/glib:2
+DEPEND="
+	>=net-libs/nDPI-3.0:=
+	dev-db/mysql-connector-c:=
+	dev-db/sqlite:3
 	dev-libs/hiredis
+	dev-libs/json-c:=
+	dev-libs/libmaxminddb
 	dev-libs/libsodium:=
-	dev-libs/libxml2
+	dev-libs/openssl
 	net-analyzer/rrdtool
 	net-libs/libpcap
-	=net-libs/nDPI-2.0
+	net-libs/zeromq:=
 	net-misc/curl
-	sys-libs/binutils-libs:=
-	dev-db/mysql-connector-c:="
-RDEPEND="${DEPEND}
-	dev-db/redis"
+	sys-libs/libcap
+	sys-libs/zlib
+"
+RDEPEND="
+	${DEPEND}
+	dev-db/redis
+"
+BDEPEND="
+	virtual/pkgconfig
+"
 PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-mysqltool.patch
-	"${FILESDIR}"/${P}-pointer-cmp.patch
+	"${FILESDIR}"/${PN}-3.8-mysqltool.patch
+	"${FILESDIR}"/${PN}-3.8-ndpi-includes.patch
+	"${FILESDIR}"/${PN}-3.8.1-PKG_CONFIG.patch
+	"${FILESDIR}"/${PN}-3.8.1-parallel-make.patch
 )
+RESTRICT="test"
 
-src_prepare() {
-	sed -e "s/@VERSION@/${PV}/g;s/@SHORT_VERSION@/${PV}/g" < "${S}/configure.seed" > "${S}/configure.ac" || die
+pkg_setup() {
+	enewuser ntopng
+}
 
+src_prepare() {
 	default
 
+	sed \
+		-e "s/@VERSION@/${PV}.$(date +%y%m%d)/g" \
+		-e "s/@SHORT_VERSION@/${PV}/g" \
+		< "${S}/configure.seed" \
+		> "${S}/configure.ac" || die
+
 	eautoreconf
 }
 
+src_configure() {
+	tc-export PKG_CONFIG
+	default
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		MYCFLAGS="${CFLAGS}" \
+		MYLDFLAGS="${LDFLAGS}"
+}
+
 src_install() {
 	SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}"
 	dodir ${SHARE_NTOPNG_DIR}
@@ -59,15 +87,11 @@ src_install() {
 	doexe ${PN}
 	doman ${PN}.8
 
-	newinitd "${FILESDIR}/ntopng.init.d" ntopng
-	newconfd "${FILESDIR}/ntopng.conf.d" ntopng
+	newinitd "${FILESDIR}"/ntopng.init.d ntopng
+	newconfd "${FILESDIR}"/ntopng.conf.d ntopng
 
-	dodir "/var/lib/ntopng"
-	fowners ntopng "/var/lib/ntopng"
-}
-
-pkg_setup() {
-	enewuser ntopng
+	keepdir /var/lib/ntopng
+	fowners ntopng /var/lib/ntopng
 }
 
 pkg_postinst() {
diff --git a/net-analyzer/odhcploc/Manifest b/net-analyzer/odhcploc/Manifest
index 349a4dd89311..3bb6d889b4b7 100644
--- a/net-analyzer/odhcploc/Manifest
+++ b/net-analyzer/odhcploc/Manifest
@@ -1,3 +1,3 @@
 DIST odhcploc-20111021.tar.gz 13831 BLAKE2B c0eb71bc47bdf70fee5f701d6d3a6641110682c82f49f3ea38402526cd4f83e588cbd75272adfafae15e9e3d2c366a9b4004a0a6cfe478cd469c6507627f0e28 SHA512 3270b2bf25e079544805ceaba152e4d47a3cae3d78db0429b21c884686de8e0a872628a92390eebe5128ebcf9dcc3d14020420bb95ae8b367784ae4282d21556
-EBUILD odhcploc-20111021.ebuild 416 BLAKE2B 713e14f1606dd5a5adb5882171ba70afea59a681a4445f7a2ad35faefb541088088e4132de8d1ac41392c7a3fdaa0c2b6b8eedbeeba97c3a1fe99c43f8e71ce6 SHA512 366fd9bd438ea318d5cbd116ea0e1bffc40db18917590d1a473ab8de5fc34858f52a54d2ea0d181f5136617ea5e10d58637f40bd7a2233c45b73c744c6328fcb
+EBUILD odhcploc-20111021-r1.ebuild 415 BLAKE2B 238f155662897f7ec7bb2973206f318165d2fd045c62021a129efe9baa054b823a40347e94e4c4348650c4b003f2f8f87dba71aa47b24876a0cb6f2e41650a4b SHA512 23ae64ed8c902be6c7faee80cebe7d64978894d8479ed2a621ffe791eea528adee87e8e704f1da1c6c43f0fd85d3de7a15a59998dd24421f2fea0cedd464b03f
 MISC metadata.xml 463 BLAKE2B cd29070e0c1a969bf077da5afd4a3342091e1ecb88837cd975ede45e42da574ed955cf3f9d97452eb45d24213f7d794a4e0c45f0f47f53c9f0f185fbd5922c23 SHA512 17259ba58976713396fb8bbf67e994f0106c219798de1e08b8cee64c89d8bfaef01af32f108f3f7e4335b9d1b3a7af194ae9396eb042d1e7d7abd1df1e338b91
diff --git a/net-analyzer/odhcploc/odhcploc-20111021.ebuild b/net-analyzer/odhcploc/odhcploc-20111021-r1.ebuild
index aff915d2ef97..57f948763029 100644
--- a/net-analyzer/odhcploc/odhcploc-20111021.ebuild
+++ b/net-analyzer/odhcploc/odhcploc-20111021-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="Open DHCP Locator"
@@ -12,7 +12,7 @@ LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64"
 
-src_prepare() {
+src_configure() {
 	tc-export CC
 }
 
diff --git a/net-analyzer/openvas-libraries/Manifest b/net-analyzer/openvas-libraries/Manifest
deleted file mode 100644
index 88c4391b3301..000000000000
--- a/net-analyzer/openvas-libraries/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX OPENVAS.gentoo 3648 BLAKE2B 69e29eec91e2384c7cc984cc09d8338865049d627662412748a2d16fea3043c832a448d52bba5795d0e20d2429525470bc8ce73fc321838853019136c5e06f3c SHA512 b81ef24a80c3774dc31dc2193e19767fb90fb2aa783f827fc45d2e54450b3f27789da8eb394708741ff6e96e86dd46b6b94c1f675ccf077a965b0825aa8c32b2
-AUX openvas-libraries-9.0.3-cachedir.patch 793 BLAKE2B 1891f7d81f328f3b2bb63972478fab7763e17710a420aa7e592beb681b514b3361dd570d3b99fe9bd31b0ce7ff32905a23ca23cb6dd02eda04b2495305cdd0f2 SHA512 412d07104d4ce226ee95d84728308b43e51931d4705601e16b35fbad30a49d943831fa7c8f183e41e00c249bf0d3f3786eab5184ede8a2a9c5574a124c43c4ad
-AUX openvas-libraries-9.0.3-gcc8.patch 2288 BLAKE2B 1b5fb4e77cbba1ef5a80217225f726be14e3fa8a79280d6433ae7f5a89edc0bcf0c2e26b48f28ddbee515962ae9b0ac2dbf5b06df666369ca3327469a509f2dc SHA512 7e2a3d3df6db4ed64263cc99df13e0e0c1c80be25257f1d6b1034b9aa63ca68b8a42376f50b95c8357542a97abfa42fc2ba379a7c16af931bf61e08fa8a417e4
-AUX openvas-libraries-9.0.3-netsnmp.patch 424 BLAKE2B 2fca08ace15ebe55891678e55b3324b1d4da817468788b13d009a4fbe1c35c90b6a022ddf3b7d3dc3c6fb9d500e04834cc729364341b7fc1e2e066907f9a891e SHA512 b80e00c267e1848474485cc3153d659672a20ef536e6e4bec81b737360dc908027be49c0723b04b0a7cdf317f97c3d6a76204cfbed1b60ed88db65421788e3ae
-AUX openvas-libraries-9.0.3-rpath.patch 440 BLAKE2B 661d4b84ca3795dbfdd5830443259adfa30777475d063a3af14773e632948be836bd752f781fc2e8249587cae659faba18f5a340bf5fb83db4ad992ad694b87b SHA512 e2bf434ce4d7aac98c66b7175e475beab26a3d3ad680c088962a080f53528ae073f9e626d9235608151c312fbba8c51f8ca0dc0445a3c871148b8d2ae5ddf565
-AUX openvas-libraries-9.0.3-rundir.patch 1735 BLAKE2B d203bae1ee34f259ef6d6142004358d7617e1323239a6c0df87a76a7b4379277a7f4f414c6e2402f9dfa249d4df5db73c38664ee2a7e72aa29ce55fed844710c SHA512 0626e82f15e8be1c8b0e55e1a4daac78e3d848b46d6b5c039ee8e76c0891fb2dd6c51dc4096a5a1eadc9ab9c34d4313b4c93be68bdf3364a303e2572908628c1
-AUX openvas-libraries-9.0.3-underlinking.patch 2053 BLAKE2B 036fc4eab61063b330667a0c3c1a11ed0b559b61149dafa21df3fbd806f4f7cf58c50b23d9db4c17dd0dadce04725600bf362c9aced75b64ae8458946a4fbdbc SHA512 225dd41b2d96cfcf1031a0e2bf2f338ff30612fb03ce969ff4c292e10149c57f85560f0df98e697ab7dfb0a8c1ee82ccb3286bb3d1b652df902a8bc594c2e44f
-DIST openvas-libraries-9.0.3.tar.gz 643948 BLAKE2B c05fbcd2a1b9c2292ac2d7ea3c7f4fe2ff4c5a41b0dd5610283712ce136fe4184d46b9fdcfb74bf2a4a6d7c016497df31caff121d9c7b013280164b49f874f4f SHA512 bca213309e06a39d2dcd790cacb01f2a71471622887424e41cc025a2bc25feb6a9b2c1d904f739df6fd87d8ec7af5171b31d1f5d08411c5143e4be1e6723397a
-EBUILD openvas-libraries-9.0.3-r1.ebuild 2046 BLAKE2B f2b7af911415b45e18868eeb6cc134c56110bca8ddb76f1a140229fce83ba08c0d9d3a217a19ce79f2d43b1f90d2818ef5fab4a2b8d4d1dd8d88b15ab5342756 SHA512 bb1518514b41fac1dcb9fde05b64e2f3c0f6aa6cbdb9a47710e7d0bd6314edfccca46c6841b528b712e36fa1840fb2f51b32189b7b70820dbfa443cd1c394577
-MISC metadata.xml 541 BLAKE2B 79eea1b719e8891759105135f233184f63e819370efebb46bad6bea7425b37ffbf9122444c3e9379953ccd30555b1a840297dc74ac3abccd1afc842fa2a2d16b SHA512 4b3f65acd3a359fbc7d69ebad4dcfc1866837605b8a413999372d451ffba322f50ea72f5372370afe1385991d2b1be87e05de265e12fc989f6f1a5a1d16c1f99
diff --git a/net-analyzer/openvas-libraries/files/OPENVAS.gentoo b/net-analyzer/openvas-libraries/files/OPENVAS.gentoo
deleted file mode 100644
index ab3f4c8918c7..000000000000
--- a/net-analyzer/openvas-libraries/files/OPENVAS.gentoo
+++ /dev/null
@@ -1,106 +0,0 @@
------------------------------------------------------------------
---------------------------IMPORTANT------------------------------
------------------------------------------------------------------
-You will need to set up your /etc/redis.conf file properly before
-running openvas-scanner for the first time.
-For details, please see the example config file installed to:
---> /etc/openvas/redis.conf.example
-Please configure /etc/openvas/openvassd.conf properly
-according to redis listening unix socket.
-e.g. /etc/openvas/openvassd.conf --> kb_location = /tmp/redis.sock
-If you use first-start script it will check various issues and
-automatically setup OpenVAS for first time use.
-GSA(Greenbone Security Agent) WebUI listens port
-9392(local) default. If you want to use nginx reverse proxy
-to reach WebUI please see the example config file
---> /etc/openvas/gsa.nginx.reverse.proxy.example
-otherwise you can change port to 443 or 80.
-
------------------------------------------------------------------
----------------------------SCRIPTS-------------------------------
------------------------------------------------------------------
-'first-start'                  
---> Automatically setup OpenVAS for first time use
---> Installed in /etc/openvas/scripts
-
-'openvas-feed-sync'
---> Updates Feeds | You can add this to cron
---> Installed in /etc/openvas/scripts
-
------------------------------------------------------------------
-----------ENVIRONMENT SETTINGS FOR SYSTEMD & OPEN-RC-------------
------------------------------------------------------------------
-'openvas-scanner-daemon.conf'  
---> OpenVAS Scanner systemd daemon settings
---> Installed in /etc/openvas/sysconfig
-
-'gvmd-daemon.conf'
---> OpenVAS Manager systemd daemon settings
---> Installed in /etc/openvas/sysconfig
-
-'gsa-daemon.conf
---> Greenbone Security Agent systemd daemon settings
---> Installed in /etc/openvas/sysconfig
-
-'openvas-scanner'
---> OpenVAS Scanner open-rc daemon settings
---> Installed in /etc/config.d
-
-'gvmd'
---> OpenVAS Manager open-rc daemon settings
---> Installed in /etc/config.d
-
-'gsa'
---> Greenbone Security Agent systemd daemon settings
---> Installed in /etc/config.d
-
------------------------------------------------------------------
---------QUICK START COMMANDS (IF YOU DON'T USE SCRIPTS)----------
------------------------------------------------------------------
-'env-update && source /etc/profile'
---> Update PATHS
-
-'openvas-manage-certs -a'
---> Create certificates automatically first time
-
-'greenbone-nvt-sync'
---> Update NVT Feed
-
-'greenbone-scapdata-sync'
---> Update scapdata Feed
-
-'greenbone-certdata-sync'
---> Update certdata Feed
-
-'openvassd --foreground --only-cache'
---> Generate initial NVT cache and quit
-
-'rc-service openvas-scanner start or systemctl start openvas-scanner' 
---> Start OpenVAS-Scanner
-
-'openvasmd --rebuild --progress'
---> Initialize the Database
-
-'openvasmd --create-user=admin --role=Admin'
---> Create User for WEBUI.Save your password
-
-'rc-service gvmd start or systemctl start gvmd'
---> Start OpenVAS-Manager
-
-'rc-service gsa start or systemctl start gsa'
---> Start the Greenbone Security Assistant
-
------------------------------------------------------------------
----------------------PLUGIN KEY AND SIGNING----------------------
------------------------------------------------------------------
-'gpg --homedir=/etc/openvas/gnupg --gen-key'
---> Generate Key
-
-'wget https://www.greenbone.net/GBCommunitySigningKey.asc'
---> Official OpenVAS Transfer Key
-
-'gpg --homedir=/etc/openvas/gnupg --import GBCommunitySigningKey.asc' 
---> Import OpenVAS Transfer Key
-
-'gpg --homedir=/etc/openvas/gnupg --lsign-key 0ED1E580'
---> Sign
diff --git a/net-analyzer/openvas-libraries/files/openvas-libraries-9.0.3-cachedir.patch b/net-analyzer/openvas-libraries/files/openvas-libraries-9.0.3-cachedir.patch
deleted file mode 100644
index 34fc9f68f437..000000000000
--- a/net-analyzer/openvas-libraries/files/openvas-libraries-9.0.3-cachedir.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- gvm-libs-9.0.3/CMakeLists.txt	2019-02-04 01:40:41.981031382 +0300
-+++ gvm-libs-9.0.3/CMakeLists.txt	2019-02-04 01:44:08.867074208 +0300
-@@ -173,7 +173,6 @@
- set (OPENVAS_DATA_DIR    "${DATADIR}/openvas")
- set (OPENVAS_STATE_DIR   "${LOCALSTATEDIR}/lib/openvas")
- set (OPENVAS_LOG_DIR     "${LOCALSTATEDIR}/log/openvas")
--set (OPENVAS_CACHE_DIR   "${LOCALSTATEDIR}/cache/openvas")
- set (OPENVAS_SYSCONF_DIR "${SYSCONFDIR}/openvas")
- 
- set (OPENVAS_LIB_INSTALL_DIR     "${LIBDIR}")
-@@ -330,7 +329,6 @@
- 
- install (DIRECTORY DESTINATION ${OPENVAS_LOG_DIR})
- install (DIRECTORY DESTINATION ${OPENVAS_DATA_DIR})
--install (DIRECTORY DESTINATION ${OPENVAS_CACHE_DIR})
- install (DIRECTORY DESTINATION ${OPENVAS_PID_DIR})
- install (DIRECTORY DESTINATION ${OPENVAS_SYSCONF_DIR})
- install (DIRECTORY
diff --git a/net-analyzer/openvas-libraries/files/openvas-libraries-9.0.3-gcc8.patch b/net-analyzer/openvas-libraries/files/openvas-libraries-9.0.3-gcc8.patch
deleted file mode 100644
index a2809087f820..000000000000
--- a/net-analyzer/openvas-libraries/files/openvas-libraries-9.0.3-gcc8.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- gvm-libs-9.0.3/nasl/nasl_isotime.c	2018-08-29 19:01:12.000000000 +0300
-+++ gvm-libs-9.0.3/nasl/nasl_isotime.c	2019-02-01 21:11:40.460358131 +0300
-@@ -102,9 +102,13 @@
-       struct tm *tp;
- 
-       tp = gmtime (&atime);
--      snprintf (timebuf, ISOTIME_SIZE, "%04d%02d%02dT%02d%02d%02d",
-+      if (snprintf (timebuf, ISOTIME_SIZE, "%04d%02d%02dT%02d%02d%02d",
-                 1900 + tp->tm_year, tp->tm_mon+1, tp->tm_mday,
--                tp->tm_hour, tp->tm_min, tp->tm_sec);
-+                tp->tm_hour, tp->tm_min, tp->tm_sec) < 0)
-+        {
-+          *timebuf = '\0';
-+          return;
-+        }
-     }
- }
- 
-@@ -480,8 +484,9 @@
-       || year < 0 || month < 1 || day < 1)
-     return 1;
- 
--  snprintf (atime, ISOTIME_SIZE, "%04d%02d%02dT%02d%02d%02d",
--            year, month, day, hour, minute, sec);
-+  if (snprintf (atime, ISOTIME_SIZE, "%04d%02d%02dT%02d%02d%02d",
-+              year, month, day, hour, minute, sec) < 0)
-+    return 1;
-   return 0;
- }
- 
-@@ -519,8 +524,9 @@
-       || year < 0 || month < 1 || day < 1)
-     return 1;
- 
--  snprintf (atime, ISOTIME_SIZE, "%04d%02d%02dT%02d%02d%02d",
--            year, month, day, hour, minute, sec);
-+  if (snprintf (atime, ISOTIME_SIZE, "%04d%02d%02dT%02d%02d%02d",
-+            year, month, day, hour, minute, sec) < 0)
-+    return 1;
-   return 0;
- }
- 
-@@ -558,13 +564,14 @@
-       || year < 0 || month < 1 || day < 1)
-     return 1;
- 
--  snprintf (atime, ISOTIME_SIZE, "%04d%02d%02dT%02d%02d%02d",
--            year, month, day, hour, minute, sec);
-+  if (snprintf (atime, ISOTIME_SIZE, "%04d%02d%02dT%02d%02d%02d",
-+                year, month, day, hour, minute, sec) < 0)
-+    return 1;
-   return 0;
- }
- 
- 
--
-+
- /**
-  * @brief Return the current time in ISO format
-  * @naslfn{isotime_now}
-@@ -784,9 +791,9 @@
-   memcpy (timebuf, string, ISOTIME_SIZE -1);
-   timebuf[ISOTIME_SIZE - 1] = 0;
- 
--  nyears = get_int_local_var_by_name (lexic, "years", 0);
--  ndays = get_int_local_var_by_name (lexic, "days", 0);
--  nseconds = get_int_local_var_by_name (lexic, "seconds", 0);
-+  nyears = get_int_var_by_name (lexic, "years", 0);
-+  ndays = get_int_var_by_name (lexic, "days", 0);
-+  nseconds = get_int_var_by_name (lexic, "seconds", 0);
- 
-   if (nyears && add_years_to_isotime (timebuf, nyears))
-     return NULL;
diff --git a/net-analyzer/openvas-libraries/files/openvas-libraries-9.0.3-netsnmp.patch b/net-analyzer/openvas-libraries/files/openvas-libraries-9.0.3-netsnmp.patch
deleted file mode 100644
index 69305576d0d7..000000000000
--- a/net-analyzer/openvas-libraries/files/openvas-libraries-9.0.3-netsnmp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gvm-libs-9.0.3/CMakeLists.txt	2018-08-29 19:01:12.000000000 +0300
-+++ gvm-libs-9.0.3/CMakeLists.txt	2019-02-01 20:58:45.946113012 +0300
-@@ -238,7 +238,7 @@
-     OUTPUT_STRIP_TRAILING_WHITESPACE)
- 
-   message (STATUS "Looking for netsnmp...")
--  find_library (SNMP snmp)
-+  find_library (SNMP netsnmp)
-   message (STATUS "Looking for netsnmp... ${SNMP}")
-   if (SNMP)
-     execute_process (COMMAND net-snmp-config --libs
diff --git a/net-analyzer/openvas-libraries/files/openvas-libraries-9.0.3-rpath.patch b/net-analyzer/openvas-libraries/files/openvas-libraries-9.0.3-rpath.patch
deleted file mode 100644
index e14e2965e9fe..000000000000
--- a/net-analyzer/openvas-libraries/files/openvas-libraries-9.0.3-rpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gvm-libs-9.0.3/CMakeLists.txt	2019-02-04 21:42:27.367627369 +0300
-+++ gvm-libs-9.0.3/CMakeLists.txt	2019-02-04 21:45:48.961135211 +0300
-@@ -80,7 +80,7 @@
- # TODO: Check pkg-config (maybe with code like in gsa/CMakeLists.txt).
- 
- ## CPack configuration
--
-+set (CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
- set (CPACK_CMAKE_GENERATOR "Unix Makefiles")
- set (CPACK_GENERATOR "TGZ")
- set (CPACK_INSTALL_CMAKE_PROJECTS ".;openvas-libraries;ALL;/")
diff --git a/net-analyzer/openvas-libraries/files/openvas-libraries-9.0.3-rundir.patch b/net-analyzer/openvas-libraries/files/openvas-libraries-9.0.3-rundir.patch
deleted file mode 100644
index 6ecdc8a64219..000000000000
--- a/net-analyzer/openvas-libraries/files/openvas-libraries-9.0.3-rundir.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- gvm-libs-9.0.3/CMakeLists.txt	2019-02-04 14:50:41.230530261 +0300
-+++ gvm-libs-9.0.3/CMakeLists.txt	2019-02-04 14:55:08.649433070 +0300
-@@ -162,9 +162,9 @@
-   set (DATADIR "${CMAKE_INSTALL_PREFIX}/share")
- endif (NOT DATADIR)
- 
--if (NOT OPENVAS_PID_DIR)
--  set (OPENVAS_PID_DIR "${LOCALSTATEDIR}/run")
--endif (NOT OPENVAS_PID_DIR)
-+#if (NOT OPENVAS_PID_DIR)
-+#  set (OPENVAS_PID_DIR "${LOCALSTATEDIR}/run")
-+#endif (NOT OPENVAS_PID_DIR)
- 
- #if (NOT SYSCONFDIR)
- #  set (SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/etc")
---- gvm-libs-9.0.3/base/pidfile.c	2018-08-29 19:01:12.000000000 +0300
-+++ gvm-libs-9.0.3/base/pidfile.c	2019-02-04 15:08:04.600958560 +0300
-@@ -59,7 +59,7 @@
- pidfile_create (gchar * daemon_name)
- {
-   gchar *name_pid = g_strconcat (daemon_name, ".pid", NULL);
--  gchar *pidfile_name = g_build_filename (OPENVAS_PID_DIR, name_pid, NULL);
-+  gchar *pidfile_name = g_build_filename (name_pid, NULL);
-   FILE *pidfile = g_fopen (pidfile_name, "w");
- 
-   g_free (name_pid);
-@@ -88,7 +88,7 @@
- pidfile_remove (gchar * daemon_name)
- {
-   gchar *name_pid = g_strconcat (daemon_name, ".pid", NULL);
--  gchar *pidfile_name = g_build_filename (OPENVAS_PID_DIR, name_pid, NULL);
-+  gchar *pidfile_name = g_build_filename (name_pid, NULL);
-   gchar *pidfile_contents;
- 
-   g_free (name_pid);
---- gvm-libs-9.0.3/CMakeLists.txt	2019-02-04 17:39:39.776282496 +0300
-+++ gvm-libs-9.0.3/CMakeLists.txt	2019-02-04 17:39:23.160269081 +0300
-@@ -329,7 +329,6 @@
- 
- install (DIRECTORY DESTINATION ${OPENVAS_LOG_DIR})
- install (DIRECTORY DESTINATION ${OPENVAS_DATA_DIR})
--install (DIRECTORY DESTINATION ${OPENVAS_PID_DIR})
- install (DIRECTORY DESTINATION ${OPENVAS_SYSCONF_DIR})
- install (DIRECTORY
-   DESTINATION ${OPENVAS_SYSCONF_DIR}/gnupg
diff --git a/net-analyzer/openvas-libraries/files/openvas-libraries-9.0.3-underlinking.patch b/net-analyzer/openvas-libraries/files/openvas-libraries-9.0.3-underlinking.patch
deleted file mode 100644
index e3c25f9b9c41..000000000000
--- a/net-analyzer/openvas-libraries/files/openvas-libraries-9.0.3-underlinking.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- gvm-libs-9.0.3/base/CMakeLists.txt	2019-02-04 15:11:20.848707365 +0300
-+++ gvm-libs-9.0.3/base/CMakeLists.txt	2019-02-04 15:40:27.745955904 +0300
-@@ -88,7 +88,7 @@
-       assuan libgpg-error ole32 ws2_32 ffi z shlwapi dnsapi winmm)
-     target_link_libraries (openvas_base_shared ${W32LIBS})
-   else (MINGW)
--    target_link_libraries (openvas_base_shared LINK_PRIVATE ${GLIB_LDFLAGS} ${GIO_LDFLAGS} ${ZLIB_LDFLAGS} ${GPGME_LDFLAGS} ${REDIS_LDFLAGS} ${LINKER_HARDENING_FLAGS})
-+    target_link_libraries (openvas_base_shared LINK_PRIVATE ${LIBSSH_LDFLAGS} ${GLIB_LDFLAGS} ${GIO_LDFLAGS} ${ZLIB_LDFLAGS} ${GPGME_LDFLAGS} ${REDIS_LDFLAGS} ${LINKER_HARDENING_FLAGS})
-   endif (MINGW)
- endif (BUILD_SHARED)
- 
-@@ -102,10 +102,10 @@
- 
- # Link the test-hosts executable
- # TODO: This is currently only built for BUILD_SHARED
--if (BUILD_SHARED)
--  add_executable (test-hosts test-hosts.c)
--  target_link_libraries (test-hosts openvas_base_shared ${GLIB_LDFLAGS} ${REDIS_LDFLAGS})
--endif (BUILD_SHARED)
-+#if (BUILD_SHARED)
-+#  add_executable (test-hosts test-hosts.c)
-+#  target_link_libraries (test-hosts openvas_base_shared ${GLIB_LDFLAGS} ${REDIS_LDFLAGS})
-+#endif (BUILD_SHARED)
- 
- ## Install
- if (BUILD_STATIC)
-@@ -123,3 +123,4 @@
- endif (BUILD_SHARED)
- 
- ## End
-+
---- gvm-libs-9.0.3/misc/CMakeLists.txt	2019-02-04 15:11:20.847707368 +0300
-+++ gvm-libs-9.0.3/misc/CMakeLists.txt	2019-02-04 15:49:34.035071570 +0300
-@@ -146,7 +146,7 @@
-   else (MINGW)
-     target_link_libraries (openvas_misc_shared LINK_PRIVATE ${GNUTLS_LDFLAGS} openvas_base_shared ${UUID_LDFLAGS}
-                            ${GLIB_LDFLAGS} ${PCAP_LDFLAGS} ${LIBSSH_LDFLAGS} ${LDAP_LDFLAGS}
--                           ${GCRYPT_LDFLAGS} ${RADIUS_LDFLAGS}
-+                           ${REDIS_LDFLAGS} ${GCRYPT_LDFLAGS} ${RADIUS_LDFLAGS}
-                            ${LINKER_HARDENING_FLAGS})
-   endif (MINGW)
- endif (BUILD_SHARED)
-@@ -198,3 +198,4 @@
-            ARCHIVE DESTINATION ${LIBDIR}
-            PUBLIC_HEADER DESTINATION "${INCLUDEDIR}/openvas/misc")
- endif (BUILD_SHARED)
-+
diff --git a/net-analyzer/openvas-libraries/metadata.xml b/net-analyzer/openvas-libraries/metadata.xml
deleted file mode 100644
index c71bb473eca2..000000000000
--- a/net-analyzer/openvas-libraries/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>hasan.calisir@psauxit.com</email>
-		<name>Hasan ÇALIŞIR</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<use>
-		<flag name="extras">Html docs support</flag>
-		<flag name="ldap">Enable support for ldap</flag>
-		<flag name="radius">Enable support for radius</flag>
-	</use>
-</pkgmetadata>
diff --git a/net-analyzer/openvas-libraries/openvas-libraries-9.0.3-r1.ebuild b/net-analyzer/openvas-libraries/openvas-libraries-9.0.3-r1.ebuild
deleted file mode 100644
index 8f1d7043fc10..000000000000
--- a/net-analyzer/openvas-libraries/openvas-libraries-9.0.3-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake-utils
-MY_PN="gvm-libs"
-
-DESCRIPTION="A remote security scanner for Linux (openvas-libraries)"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="https://github.com/greenbone/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="extras ldap radius"
-
-DEPEND="
-	app-crypt/gpgme:=
-	dev-libs/hiredis
-	dev-libs/libgcrypt:0=
-	dev-libs/libksba
-	dev-perl/UUID
-	net-analyzer/net-snmp
-	net-libs/gnutls:=[tools]
-	net-libs/libpcap
-	net-libs/libssh:=
-	sys-libs/zlib
-	extras? ( dev-perl/CGI )
-	ldap? ( net-nds/openldap )
-	radius? ( net-dialup/freeradius-client )"
-
-RDEPEND="
-	${DEPEND}"
-
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	extras? ( app-doc/doxygen[dot]
-		  app-doc/xmltoman
-		  app-text/htmldoc
-		  dev-perl/SQL-Translator
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc8.patch"
-	"${FILESDIR}/${P}-netsnmp.patch"
-	"${FILESDIR}/${P}-cachedir.patch"
-	"${FILESDIR}/${P}-rundir.patch"
-	"${FILESDIR}/${P}-underlinking.patch"
-	"${FILESDIR}/${P}-rpath.patch"
-)
-
-BUILD_DIR="${WORKDIR}/${MY_PN}-${PV}_build"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	if use extras; then
-		doxygen -u "$S"/doc/Doxyfile_full.in || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr"
-		"-DLOCALSTATEDIR=${EPREFIX}/var"
-		"-DSYSCONFDIR=${EPREFIX}/etc"
-		$(usex ldap -DBUILD_WITHOUT_LDAP=0 -DBUILD_WITHOUT_LDAP=1)
-		$(usex radius -DBUILD_WITHOUT_RADIUS=0 -DBUILD_WITHOUT_RADIUS=1)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use extras; then
-		cmake-utils_src_make -C "${BUILD_DIR}" doc
-		cmake-utils_src_make doc-full -C "${BUILD_DIR}" doc
-		HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /usr/share/openvas
-	doins "${FILESDIR}"/OPENVAS.gentoo
-
-	keepdir /var/lib/openvas/gnupg
-	keepdir /var/log/openvas
-}
diff --git a/net-analyzer/openvas-manager/Manifest b/net-analyzer/openvas-manager/Manifest
deleted file mode 100644
index 3964b6e98fa7..000000000000
--- a/net-analyzer/openvas-manager/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX gvmd-daemon.conf 484 BLAKE2B 440776ba66ac433b572e2defefe4ca9c1589054ccdacc7631a2c6621a2312433828082f19c6d262b64b0326d86c2a090c5622c16056b94f1a0376c6c0c568f59 SHA512 6c366146561435c194475d6d84a52aa8f8ec068a53dc16f7de334e2c0d54a404cd9257f878c95ae0ee33e5811d8b824a9ec3c39d2cfbd02f69f2b0a390926d1e
-AUX gvmd.init 549 BLAKE2B 3eb2ac2b47e5821b04f794fdb6ea15146412ed1ccdcb8fbf54b8b3b0f742aa0fa1289ba744dcd56568fddc6e42b328fe6f3961249f492e7a506f0282d38a155b SHA512 029f80e09bf15f957398e688cb109141c38c5ccd890ad5c43b08dd43ffa96cf92cf1f3d46624469a79c19a1ea63b6beb73ebff58039ed68f14d0bade14da2cfa
-AUX gvmd.logrotate 217 BLAKE2B d6eb74a1cdc1cfb5500e5ed4e62ab9c453ec5d1665ba55c2618010480211ef6349823ecd35d62b166c771f8f795643f00cd7920c8f665a73de9fa91382d19eef SHA512 e92e6aafa30e621ed2598508216453477ce1c30eb2d9bf418c7657e3312978d514fbdd663273ca7009cfc0b61b5e95a6c3231c3d7b0e62f2e991dea9afd4d2b1
-AUX gvmd.service 516 BLAKE2B 271ee87125843ffd5ac997d6e3b9a46a2cd45e8ebb9630f2fa0adf7c5c081e102fc11e69b38fe2ca12854597186f76145044478b4908031495dbd7bc61a88217 SHA512 90165185c50c451b58f1173fe3bad0e9ebfaa6a2120b33920f8ab03960bc09e7a84c07b6658fbb2d649e1a3726addd40420ceb5b63b1d6f885429861896f8f74
-DIST openvas-manager-7.0.3.tar.gz 1796830 BLAKE2B b1e8bf8eb4cc0e2d3e5d67d7c17df3c79c7d65e798fc28f75ee55c2165a5e957ac950ccac14a20a5b332c15b64775f63805db00810271bce77d13b16db60a3ab SHA512 75e519e5f63fad043efe55ad5843934f9ffaefa052609e8d110b2084504a7658b5ee5797f7ffaa71592caed64b7fd4fac623bc7797bec72a51e8225d65f7fc28
-EBUILD openvas-manager-7.0.3.ebuild 2102 BLAKE2B 7a2ab62f1b5aa3cf6629eb4cf13786cf5bb0b2c7e9655bca25b471ca367d8d3585db81ef1af92e97310c656b7359a0dad45f3ad173617961ad60a9628bc0abc8 SHA512 7d2d4ef4891717d906163447f849db9575db663995aa5c805cf6eea73d56767d3f563c7aa767ff0ef3ce10b6f116f0e4d9ec5ed919b087ad46c3a80031567a50
-MISC metadata.xml 435 BLAKE2B 4d40c4dcffe9bfd81d1c1b517b4e6d6e1e658f9d6be65f8ad962ecbbee78bf0cc6bbb5805f2e056375c7371697a453453f8eeae40bae1bdf890be8f3e23ccfbc SHA512 fc802728917b8ebc3c43e3c35ce1fa7b8aa30d89d60abcfcd82eb6baf0152d02384b2e336664942bd89c3ed27a418f37a13699b68a424f36645c51c1310a6e16
diff --git a/net-analyzer/openvas-manager/files/gvmd-daemon.conf b/net-analyzer/openvas-manager/files/gvmd-daemon.conf
deleted file mode 100644
index eb3e683c42a3..000000000000
--- a/net-analyzer/openvas-manager/files/gvmd-daemon.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-
-# OpenVAS Manager command args
-
-# e.g --foreground
-OPENVAS_MANAGER_OPTIONS=""
-
-# Manager listen port
-OPENVAS_MANAGER_PORT="--port=9390"
-
-# Manager listen address
-OPENVAS_MANAGER_LISTEN_ADDRESS="--listen=127.0.0.1"
-
-# Scanner unix socket
-OPENVAS_MANAGER_SCANNER_HOST="--scanner-host=/var/run/openvassd.sock"
-
-# TLS settings
-OPENVAS_MANAGER_GNUTLS_PRIORITIES="--gnutls-priorities=SECURE256:+SUITEB192:+SECURE192:+SECURE128:+SUITEB128:-MD5:-SHA1:-VERS-TLS1.0:-VERS-TLS1.1:-VERS-SSL3.0"
diff --git a/net-analyzer/openvas-manager/files/gvmd.init b/net-analyzer/openvas-manager/files/gvmd.init
deleted file mode 100644
index a7de3800adac..000000000000
--- a/net-analyzer/openvas-manager/files/gvmd.init
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-name="OpenVAS Manager"
-command=/usr/sbin/openvasmd
-command_args="${OPENVAS_MANAGER_OPTIONS} ${OPENVAS_MANAGER_PORT} ${OPENVAS_MANAGER_LISTEN_ADDRESS} ${OPENVAS_MANAGER_SCANNER_HOST} ${OPENVAS_MANAGER_GNUTLS_PRIORITIES}"
-pidfile="/var/run/openvasmd.pid"
-command_background="true"
-
-depend() {
-	after bootmisc
-	need localmount net openvas-scanner
-}
-
-start_pre() {
-	checkpath --directory --mode 0775 --quiet /var/cache/openvas
-}
diff --git a/net-analyzer/openvas-manager/files/gvmd.logrotate b/net-analyzer/openvas-manager/files/gvmd.logrotate
deleted file mode 100644
index db8eb200580d..000000000000
--- a/net-analyzer/openvas-manager/files/gvmd.logrotate
+++ /dev/null
@@ -1,11 +0,0 @@
-# logrotate for openvas manager
-/var/log/openvas/openvasmd.log {
-        rotate 4
-        weekly
-        compress
-        delaycompress
-        missingok
-	postrotate
-	    /bin/kill -HUP `pidof openvasmd`
-	endscript
-}
diff --git a/net-analyzer/openvas-manager/files/gvmd.service b/net-analyzer/openvas-manager/files/gvmd.service
deleted file mode 100644
index c0627fcd1c73..000000000000
--- a/net-analyzer/openvas-manager/files/gvmd.service
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=OpenVAS Manager
-After=network.target
-After=openvas-scanner.service
-Wants=openvas-scanner.service
-Before=gsa.service
-
-[Service]
-Type=forking
-EnvironmentFile=-/etc/openvas/sysconfig/gvmd-daemon.conf
-ExecStart=/usr/sbin/openvasmd $OPENVAS_MANAGER_OPTIONS $OPENVAS_MANAGER_PORT $OPENVAS_MANAGER_LISTEN_ADDRESS $OPENVAS_MANAGER_SCANNER_HOST $OPENVAS_MANAGER_GNUTLS_PRIORITIES 
-ExecReload=/bin/kill -HUP $MAINPID
-KillMode=mixed
-User=root
-Group=root
-TimeoutSec=1200
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-analyzer/openvas-manager/metadata.xml b/net-analyzer/openvas-manager/metadata.xml
deleted file mode 100644
index fa26aa942e17..000000000000
--- a/net-analyzer/openvas-manager/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>hasan.calisir@psauxit.com</email>
-		<name>Hasan ÇALIŞIR</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<use>
-		<flag name="extras">Html docs support</flag>
-	</use>
-</pkgmetadata>
diff --git a/net-analyzer/openvas-manager/openvas-manager-7.0.3.ebuild b/net-analyzer/openvas-manager/openvas-manager-7.0.3.ebuild
deleted file mode 100644
index 39f1f277b47b..000000000000
--- a/net-analyzer/openvas-manager/openvas-manager-7.0.3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake-utils flag-o-matic systemd
-MY_PN="gvmd"
-
-DESCRIPTION="A remote security manager for Linux (openvas-manager)"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="https://github.com/greenbone/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="extras"
-
-DEPEND="
-	dev-db/sqlite:3
-	dev-libs/libgcrypt:0=
-	>=net-analyzer/openvas-libraries-9.0.3
-	extras? ( dev-perl/CGI
-		  dev-perl/GD
-		  media-libs/gd:2=
-	)"
-
-RDEPEND="
-	${DEPEND}
-	~net-analyzer/openvas-scanner-5.1.3"
-
-BDEPEND="
-	virtual/pkgconfig
-	extras? ( app-doc/doxygen[dot]
-		  app-doc/xmltoman
-		  app-text/htmldoc
-		  dev-perl/SQL-Translator
-	)"
-
-BUILD_DIR="${WORKDIR}/${MY_PN}-${PV}_build"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	# Fix the ebuild to use correct FHS/Gentoo policy paths for 7.0.3
-	sed -i "s*/doc/openvas-manager/html/*/doc/openvas-manager-${PV}/html/*g" "$S"/doc/CMakeLists.txt || die
-	sed -i "s*/doc/openvas-manager/*/doc/openvas-manager-${PV}/*g" "$S"/CMakeLists.txt || die
-	if use extras; then
-		doxygen -u "$S"/doc/Doxyfile_full.in || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr"
-		"-DLOCALSTATEDIR=${EPREFIX}/var"
-		"-DSYSCONFDIR=${EPREFIX}/etc"
-	)
-	# Fix runtime QA error for 7.0.3
-	append-cflags -Wno-nonnull
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use extras; then
-		cmake-utils_src_make -C "${BUILD_DIR}" doc
-		cmake-utils_src_make doc-full -C "${BUILD_DIR}" doc
-		HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /etc/openvas/sysconfig
-	doins "${FILESDIR}"/${MY_PN}-daemon.conf
-
-	newinitd "${FILESDIR}/${MY_PN}.init" ${MY_PN}
-	newconfd "${FILESDIR}/${MY_PN}-daemon.conf" ${MY_PN}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${MY_PN}.logrotate" ${MY_PN}
-
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-
-	keepdir /var/lib/openvas/openvasmd
-}
diff --git a/net-analyzer/openvas-scanner/Manifest b/net-analyzer/openvas-scanner/Manifest
index 184c0e4075bb..117009f24dda 100644
--- a/net-analyzer/openvas-scanner/Manifest
+++ b/net-analyzer/openvas-scanner/Manifest
@@ -1,23 +1,12 @@
 AUX gvm-feed-sync.cron 98 BLAKE2B d0af35e85c0c84e6d848de26fbf3f03e8a7473cea9d46c513fbb0d46f1664a516c334221773309d4f9682187a0f46a447320772d52c9826cc8525df26d0b2c38 SHA512 06526d33017c83c7342d9c356fb80e22f7a145bf8cae9bd49a7c74ae5854f7248b2b3609bc0f423b7a3babaad59a4b92ba14873f7f4e20e4cd5af7eb9c01c5d0
 AUX gvm-feed-sync.sh 1037 BLAKE2B 6ef8a375a06c0ce5a6181ee26eccdfaba09a5d935c56b98bed4435fdaee6b068f8cf87889789d4108361c6c2e83fa1979d533519c47f0d621f63423c43aa96a9 SHA512 a2abb96e268c8d7f74f61cc509730e4949894fe4225b22cb0f9d4fe2b215da70cc96c79405f59f3b05e290a45de2eeeb5d5ecf632cb23da80dd2102d4900b78a
-AUX openvas-scanner-5.1.3-cachedir.patch 1605 BLAKE2B d5e54d1196000fe9f8a65efcf3d71f3ef29af1cfff5fedbfe7cd753a731e6bd4be6c1f24534b87a2194dcfa146d156ed0ddae076e72bfd229e1e01497985d7a1 SHA512 27efb9e318137390592652db1444141910ddf7975ada760bc6914c21c4eb11e4ded1aa377c37f5c7a67dfd145ec723fd77bbdd9b8ac0af6bf317a07d54642d11
-AUX openvas-scanner-5.1.3-gcc8.patch 1253 BLAKE2B ef876d70238b3b0fdaea320fdb9bcffc520bbe6762f220678a39bd99853fcabb27ed3bd44a0e02a7e1e8b93d3af530e4d4b33baaf1060c8b0589593ef5b30e8e SHA512 817e27de3b2d16bce81d3c1abbc6ced63cd6f272762ac00a8bc9ab6c5ccb765c81df1158caed58c64f897712c78fb7f0a02dcb2137dd859c3d48725e6e2699d6
-AUX openvas-scanner-5.1.3-nvt.patch 2576 BLAKE2B fed6211a6c4e9f1bed4abedf218e17f0d863e59de869424398d845e479d037f96758486fc03727c14e036814c2efa4e9dab940e032507339a1b6f2f2cda4c4c6 SHA512 b3f6b8cba51fb6c6d0eab189391a848e8f33d24f3b59bcd8f48b562812b1f79a46f3b92b01a8f231a765616fde6c0b37634f9845a5e4ba453c4aeeafed0ce8c1
 AUX openvas-scanner-6.0.1-sbin.patch 716 BLAKE2B 41883486bfa0cb27c4a05ae7290b69227b166c9179546434aece15d1aa2b380f6f9da9afdbfb684ffc68a93f4dd63093b7ce2308d67ca8f806d2cd8e12433819 SHA512 66e2a99f6c7a6d0053bbb4fa797818681983a07ad66814ae0c577b27b37d41054f6241ddd3c017a0928eddef3f2d342480b4a668402c68d28bbf48c357e65b05
-AUX openvas-scanner-daemon.conf 176 BLAKE2B 9e0a248736617d3d0a163f3586db92da4a5f273b354a472977b411d29ace507977228407a57cf11378af6ce95275a3d72518ba1b069bdc7293c2fe20d7e29e0b SHA512 3b5dcae3d2770769e627e28064e73746f9ad22aca5c9927e04583bfc3907fa538c2010bd0e5de3737979cede63d44175a645adb55391a5e2a71e96e6d31dd1f9
-AUX openvas-scanner.init 620 BLAKE2B a32349eed21d71e4968ee09fdff007aab532943e093e6b1aed9c26c474c2ab419dc5eb2e382300be85d6d34c57a521b3ac67dc1a44dd3c8045bd94aac19ea6e4 SHA512 e77c5e383504817e9ab0a98517f3e5553458b482f576f1f1965d26c5808ec7f2eac836dff0248f0f6be8dfb22aa188232c9df85af4104cc5730ad587dd52a2b0
-AUX openvas-scanner.logrotate 222 BLAKE2B 264e3b0fa47f7d933ee1f9c5d120e267a8387df8c8e5cfb8b09b23d28b983c666684430dc9aa389938dac71bef69480d74ab24fd393134ed33d9a3518314c91e SHA512 1c8b50626de9bcd7d26323d82d28ae4d25f5ce0382cfb0b16b91e58e75c05f565c7cdf19fe441647b5cd3c2ebc312b171eb6fa22c310fac1f76a0629544f030c
-AUX openvas-scanner.service 455 BLAKE2B be6f94c3d383ea1c647effc462aeddac384e4c2507a9f1145d4dc39badcb810cbca7d4c8eba74e64942d2a5895b058cad7ac3fdcfaa4c5de7335cefcb70db366 SHA512 108a13b9cbbb86acc99a4271fa5b1a051022e42f30866bd490ae606c1ffac202c61aa5bf5a1f7ee10b276484135f8f868625debbb142a802c0ff2a4c011a8206
-AUX openvas-scanner.tmpfiles.d 28 BLAKE2B b9343651fc4923451b02a5f72cad7da95e4d790a7b77eb72ca239588568a5d2b88cad1f9f698ad61403c332a44005989e8d6e67ff1ad06cab26abdf67f8d8621 SHA512 b5d98625495353d32bdcaecf5499e2cbe3a8b1a84b067018b61f2ce6e110b0e3a14a061e8791c08891a7058976555a2c7971b48c90f690605129deb457b7b754
 AUX openvassd-daemon.conf 394 BLAKE2B 9dd55e29004d6d55f0cd44568b3b22aab21cb4ed88969934e5b1905cdfb05017843ee46f59297f8cba5d7b9db35a0b9c906d1f00075c4361d57e039d7d0cf601 SHA512 c8076ecaa04824e45d7b9b90e63c530d8bbcec6ca22b4ac4d3f2b661f05b8a684f6bef340f9f4524a311c19efa85013199f2de5088efe799969bde301ebe1e82
-AUX openvassd.conf 1288 BLAKE2B d1ae7db928d797014e0382d8be3a08793efbcaa3663629c0d1c6c2d871ccf16588605fa4be21d71556893092b21ecfef72c31d40411d35dd97f8652eca6232c0 SHA512 5bb499fcd03aac4de981a64a17fa760b29b1f83d0afcdb73cdfdeb0f492b02bc383d32544fd133c6b953e73ea9ff0dc042e8dba76c22def3ee00d6f3bdd980b8
 AUX openvassd.gvm.conf 3577 BLAKE2B dd7452f0c9e63e431cf03553e221f802f7f7463ba36ad64fe18db12a44c3e7c0c4ded80cf4b7ab346a877e95271e5b10b7811d431be533eea2bb98eab53a9cee SHA512 dde7b0fe72e5dd551afdd3817562d785c95a03bbc109465490d65f81dc02a546e9d499a0c937828d2e38d357b9a7deadde12b2408307ea02a47c651c9fff4181
 AUX openvassd.init 480 BLAKE2B 28dfdabe7935ce55615fb36e6ddae3c36c84793ba01f6d3c92274a2fea1e44efe3f96bd3e7016740f4dcabff034173b541058d18f99081bd232a098a56d8e572 SHA512 1b0f13ab77f332708e9efb9cad06c47e61e47f68597c797e3f5140a921acaa2b856c10003938f737a20b534caaee7d3bb446d427373d8be8ef3fe7c83ee11b82
 AUX openvassd.logrotate 330 BLAKE2B faf900a6882bb23c29859080d0c140c9dde8dcab42f31c31bfd43342beedab0bfe711f4e918aba5c7f8e5bb91430e251e270d0bc2e6f49e84ce98cdbbfe6d023 SHA512 397c9fd0d63ab66b463f65b6d235ec3e4e6ca52a3c811ddd4efcaeffc05fed8f9cd97605f439a628c144ecc1cfcfd31290d2a9dc6e57e8197d063b4aee63d73b
 AUX openvassd.service 472 BLAKE2B 528c25dbc32cd742753eb6b155a9221f0adde0e792b1e7af376b714831bcc210a228f5a87089f449f6f0e808f46f45d40fd68d9caed44530d57d99c37dbb8b0d SHA512 3497382e6540ddc341cf17e63f1c8d2250249bb51f8dbe379d48c1f90e81d00fdf03349a4dd08c6c6c2dc7336b385fa892b316ff2315a623952d8a2db33681bd
 AUX redis.conf.example 1351 BLAKE2B ad1a99404360b76144944793b2994554799bcc6624abce68524773b7f748075b8bcec79dcf94d2f400132a424a5147a3675d67f48d23a46e28a6afdca83e50a3 SHA512 b5024c26696f49e5d453cef7a0e3838a3fa557b2339a250f95d5367a30564b8a62733c86901ae000f62e916d73162188fbca1c56ed3a078dd99e8e8db1cc2c64
-DIST openvas-scanner-5.1.3.tar.gz 254159 BLAKE2B d90fa15e143ead53abce66f933a3a4cac327176cca0f23bd88fe771ed7726b1891784ae980644c8335e560d348753115e43cfae83af9704e2d1d02827163563f SHA512 5712ab275058877cfd656e268ed09c81db6617ae247c17092f1fcd037f692f2018daf21b09b82401f99a7361bb485f0e0f7d63f8ff2387839cfdd5a3aaf8424e
 DIST openvas-scanner-6.0.1.tar.gz 522100 BLAKE2B af82b41736329bd90ba1ea73a0ace36d4115375f81a7aaff5d3bd50f21cfa3195cdf4012aa952da52c4103a31475de5c5790ef3e2e36180aa06737371fa0e5a0 SHA512 db4087fffe1d50e232fa1e51325cf7f142237e2bd3cc5dcaa1e7058a4871300f352f2c0e700eae72ea9412c347b072e9d1f2eca508b27cb30f36c6895ec95147
-EBUILD openvas-scanner-5.1.3.ebuild 2142 BLAKE2B 5984c99659d1a41c3739a1de5077f5ca8dd25c668e97c7a1f59a6efceb95fed25daceb8c8f6b5971c842e016d1843dff8527d253d1347ea0d91a67d633c2d859 SHA512 d66a67f3803c071f20e6a1c9132ca771e9286f9c6446e781b6077323ae32417d2061169543c34de91f3a9ca1ec7a4bfaf9472aead66b983a46d163ea88137480
-EBUILD openvas-scanner-6.0.1.ebuild 3324 BLAKE2B bc10da8ad9cdef4cc124f0e50879c07120a49cff1ea37d7b99462209104e1a252dc1808033cb1c69bc8010b4cf7620aef3852c9bbae424f90673892042240ad9 SHA512 7d6daa1c624ce54f5b5d683d764d972648289d4837b2f927ad9d39c5fd9149b3db4c267cb2b0d6d3032d4419d57a9881f34ef97ee66f2aefe9f2a1a1f088b1a9
+EBUILD openvas-scanner-6.0.1.ebuild 3200 BLAKE2B f6b5b723f4946e4ad05fcf18b5355c9e6b3c1c268ebad6f0bb6dbfa2f54ac979321cdb75e86688b3304a5879aa29b5ae126d26c8e9217b6fdbdf882a03464bbc SHA512 84d003b3a6f0fa44dae6a7cefa3d154d750b81bbff392d6df7f7df6ae5587f4bf964c3ac1331bedc7ade2e13255c58536f2a4ae1272f4a69025d6ee2bdbac606
 MISC metadata.xml 951 BLAKE2B 195ec0e9becddea6e9c08103473e7d26670d9fa766ed470a37f85d25a79d771654ec0305fe242d240e1255636657d086eb908f12e94fe934c7b7c66a59af7e50 SHA512 577b533837640c4131ca305e047dd6bbfc5456d19afcd91a71a8fd6b4c6cb4a464f346ac140b7e9505b2a5a4302d281616d762bc11eb123993d507cd0129b8a1
diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner-5.1.3-cachedir.patch b/net-analyzer/openvas-scanner/files/openvas-scanner-5.1.3-cachedir.patch
deleted file mode 100644
index 98c657250197..000000000000
--- a/net-analyzer/openvas-scanner/files/openvas-scanner-5.1.3-cachedir.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- openvas-scanner-5.1.3/src/openvassd.c       2018-08-29 19:27:26.000000000 +0300
-+++ openvas-scanner-5.1.3/src/openvassd.c       2019-02-04 03:28:24.635539266 +0300
-@@ -103,7 +103,6 @@
-  */
- static openvassd_option openvassd_defaults[] = {
-   {"plugins_folder", OPENVAS_NVT_DIR},
--  {"cache_folder", OPENVAS_CACHE_DIR},
-   {"include_folders", OPENVAS_NVT_DIR},
-   {"max_hosts", "30"},
-   {"max_checks", "10"},
---- openvas-scanner-5.1.3/src/CMakeLists.txt    2018-08-29 19:27:26.000000000 +0300
-+++ openvas-scanner-5.1.3/src/CMakeLists.txt    2019-02-04 03:22:20.078824664 +0300
-@@ -68,10 +68,6 @@
-   add_definitions (-DOPENVAS_NVT_DIR=\\\"${OPENVAS_NVT_DIR}\\\")
- endif (OPENVAS_NVT_DIR)
- 
--if (OPENVAS_CACHE_DIR)
--  add_definitions (-DOPENVAS_CACHE_DIR=\\\"${OPENVAS_CACHE_DIR}\\\")
--endif (OPENVAS_CACHE_DIR)
--
- if (OPENVAS_LOG_DIR)
-   add_definitions (-DOPENVAS_LOG_DIR=\\\"${OPENVAS_LOG_DIR}\\\")
- endif (OPENVAS_LOG_DIR)
---- openvas-scanner-5.1.3/CMakeLists.txt	2018-08-29 19:27:26.000000000 +0300
-+++ openvas-scanner-5.1.3/CMakeLists.txt	2019-02-04 03:18:37.889999639 +0300
-@@ -166,7 +166,6 @@
- set (OPENVAS_DATA_DIR    "${DATADIR}/openvas")
- set (OPENVAS_STATE_DIR   "${LOCALSTATEDIR}/lib/openvas")
- set (OPENVAS_LOG_DIR     "${LOCALSTATEDIR}/log/openvas")
--set (OPENVAS_CACHE_DIR   "${LOCALSTATEDIR}/cache/openvas")
- set (OPENVAS_SYSCONF_DIR "${SYSCONFDIR}/openvas")
- 
- if (NOT OPENVAS_NVT_DIR)
-@@ -265,7 +264,6 @@
-          DESTINATION ${DATADIR}/doc/openvas-scanner/ )
- 
- install (DIRECTORY DESTINATION ${OPENVAS_NVT_DIR})
--install (DIRECTORY DESTINATION ${OPENVAS_CACHE_DIR})
- 
- ## Tests
- 
-
diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner-5.1.3-gcc8.patch b/net-analyzer/openvas-scanner/files/openvas-scanner-5.1.3-gcc8.patch
deleted file mode 100644
index 4ec2e786e125..000000000000
--- a/net-analyzer/openvas-scanner/files/openvas-scanner-5.1.3-gcc8.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- openvas-scanner-5.1.3/src/ntp.c	2018-08-29 19:27:26.000000000 +0300
-+++ openvas-scanner-5.1.3/src/ntp.c	2019-02-02 00:57:56.832878754 +0300
-@@ -361,9 +361,7 @@
- }
- 
- /*----------------------------------------------------------
--
-    Communication protocol: timestamps
--
-  ----------------------------------------------------------*/
- 
- 
-@@ -391,7 +389,7 @@
- static int
- __ntp_timestamp_scan_host (int soc, char *msg, char *host)
- {
--  char timestr[1024];
-+  char timestr[64];
-   char *tmp;
-   time_t t;
-   int len;
---- openvas-scanner-5.1.3/src/pluginload.c      2018-08-29 19:27:26.000000000 +0300
-+++ openvas-scanner-5.1.3/src/pluginload.c      2019-02-02 00:59:24.494774959 +0300
-@@ -250,7 +250,7 @@
-   g_slist_free_full (oids, g_free);
- }
- 
--static int
-+static void
- plugins_reload_from_dir (void *folder)
- {
-   GSList *files = NULL, *f;
---- openvas-scanner-5.1.3/src/processes.h       2018-08-29 19:27:26.000000000 +0300
-+++ openvas-scanner-5.1.3/src/processes.h       2019-02-02 01:06:42.772908314 +0300
-@@ -28,7 +28,7 @@
- #ifndef _OPENVAS_THREADS_H
- #define _OPENVAS_THREADS_H
- 
--typedef int (*process_func_t) (void *);
-+typedef void (*process_func_t) (void *);
- pid_t create_process (process_func_t, void *);
- int terminate_process (pid_t);
diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner-5.1.3-nvt.patch b/net-analyzer/openvas-scanner/files/openvas-scanner-5.1.3-nvt.patch
deleted file mode 100644
index 67091fcf3e3b..000000000000
--- a/net-analyzer/openvas-scanner/files/openvas-scanner-5.1.3-nvt.patch
+++ /dev/null
@@ -1,93 +0,0 @@
---- openvas-scanner-5.1.3/src/attack.c	2018-08-29 19:27:26.000000000 +0300
-+++ openvas-scanner-5.1.3/src/attack.c	2019-02-02 00:44:12.834888067 +0300
-@@ -97,9 +97,7 @@
- };
- 
- /*******************************************************
--
- 		PRIVATE FUNCTIONS
--
- ********************************************************/
- 
- /**
-@@ -996,6 +994,14 @@
-   sched = plugins_scheduler_init
-            (prefs_get ("plugin_set"), prefs_get_bool ("auto_enable_dependencies"),
-             network_phase);
-+  if (sched == NULL)
-+    {
-+      error_message_to_client (global_socket,
-+                               "Failed to initialize the plugins scheduler.",
-+                               NULL, NULL);
-+      return;
-+    }
-+
- 
-   max_hosts = get_max_hosts_number ();
-   max_checks = get_max_checks_number ();
---- openvas-scanner-5.1.3/src/pluginscheduler.c	2018-08-29 19:27:26.000000000 +0300
-+++ openvas-scanner-5.1.3/src/pluginscheduler.c	2019-02-02 00:48:03.799598381 +0300
-@@ -486,7 +486,7 @@
-     }
- }
- 
--static void
-+static int
- plugins_scheduler_fill (plugins_scheduler_t sched)
- {
-   int i;
-@@ -500,6 +500,15 @@
-       int category;
- 
-       category = nvticache_get_category (element->data);
-+      if (category < 0)
-+        {
-+          log_write ("The NVT with oid %s has not category assigned. This is "
-+                     "considered a fatal error, since the NVTI Cache "
-+                     "structure stored in Redis is out dated or corrupted.",
-+                     (char *) element->data);
-+          g_slist_free_full (list, g_free);
-+          return 1;
-+        }
-       scheduler_plugin = g_malloc0 (sizeof (struct scheduler_plugin));
-       scheduler_plugin->running_state = PLUGIN_STATUS_UNRUN;
-       scheduler_plugin->oid = g_strdup (element->data);
-@@ -529,6 +538,7 @@
-         }
-     }
- 
-+  return 0;
- }
- 
- plugins_scheduler_t
-@@ -540,7 +550,11 @@
-   /* Fill our lists */
-   ret = g_malloc0 (sizeof (*ret));
-   ret->hash = hash_init ();
--  plugins_scheduler_fill (ret);
-+  if (plugins_scheduler_fill (ret))
-+    {
-+      plugins_scheduler_free (ret);
-+      return NULL;
-+    }
- 
-   plugins_scheduler_enable (ret, plugins_list, autoload);
- 
-@@ -729,9 +743,12 @@
- void
- plugins_scheduler_free (plugins_scheduler_t sched)
- {
--  int i;
--  hash_destroy (sched->hash);
--  for (i = ACT_FIRST; i <= ACT_LAST; i++)
--    list_destroy (sched->list[i]);
--  g_free (sched);
-+  if (sched)
-+    {
-+      int i;
-+      hash_destroy (sched->hash);
-+      for (i = ACT_FIRST; i <= ACT_LAST; i++)
-+        list_destroy (sched->list[i]);
-+      g_free (sched);
-+    }
- }
diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner-daemon.conf b/net-analyzer/openvas-scanner/files/openvas-scanner-daemon.conf
deleted file mode 100644
index f14b5aae6f12..000000000000
--- a/net-analyzer/openvas-scanner/files/openvas-scanner-daemon.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# OpenVAS Scanner command args
-
-# e.g --foreground
-OPENVAS_SCANNER_OPTIONS=""
-
-# Scanner listen socket
-OPENVAS_SCANNER_LISTEN_SOCKET="--unix-socket=/var/run/openvassd.sock" 
-
-
diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner.init b/net-analyzer/openvas-scanner/files/openvas-scanner.init
deleted file mode 100644
index 757b5801f29b..000000000000
--- a/net-analyzer/openvas-scanner/files/openvas-scanner.init
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-name="OpenVAS Scanner"
-command="/usr/sbin/openvassd"
-command_args="${OPENVAS_SCANNER_OPTIONS} ${OPENVAS_SCANNER_LISTEN_SOCKET}"
-pidfile="/var/run/openvassd.pid"
-command_background="true"
-
-depend() {
-	after bootmisc
-	need localmount net redis
-}
-
-start_pre() {
-	checkpath --directory --mode 0775 --quiet /var/cache/openvas
-}
-
-create_cache() {
-	checkpath --directory --mode 0775 --quiet /var/cache/openvas
-	ebegin "Generating initial Cache"
-	/usr/sbin/openvassd --foreground --only-cache
-	eend $?
-}
diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner.logrotate b/net-analyzer/openvas-scanner/files/openvas-scanner.logrotate
deleted file mode 100644
index 89f9e6d264df..000000000000
--- a/net-analyzer/openvas-scanner/files/openvas-scanner.logrotate
+++ /dev/null
@@ -1,11 +0,0 @@
-# logrotate for openvas scanner
-/var/log/openvas/openvassd.messages {
-        rotate 4
-        weekly
-        compress
-        delaycompress
-        missingok
-	postrotate
-	    /bin/kill -HUP `pidof openvassd`
-	endscript
-}
diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner.service b/net-analyzer/openvas-scanner/files/openvas-scanner.service
deleted file mode 100644
index 4f30586ab517..000000000000
--- a/net-analyzer/openvas-scanner/files/openvas-scanner.service
+++ /dev/null
@@ -1,21 +0,0 @@
-[Unit]
-Description=OpenVAS Scanner
-After=network.target
-After=redis.service
-Before=gvmd.service
-Requires=redis.service
-
-[Service]
-Type=forking
-EnvironmentFile=-/etc/openvas/sysconfig/openvas-scanner-daemon.conf
-ExecStart=/usr/sbin/openvassd $OPENVAS_SCANNER_OPTIONS $OPENVAS_SCANNER_LISTEN_SOCKET
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=on-failure
-RestartSec=10
-KillMode=mixed
-User=root
-Group=root
-TimeoutSec=1200
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner.tmpfiles.d b/net-analyzer/openvas-scanner/files/openvas-scanner.tmpfiles.d
deleted file mode 100644
index 18e820caec1b..000000000000
--- a/net-analyzer/openvas-scanner/files/openvas-scanner.tmpfiles.d
+++ /dev/null
@@ -1 +0,0 @@
-d	/var/cache/openvassd 0775
diff --git a/net-analyzer/openvas-scanner/files/openvassd.conf b/net-analyzer/openvas-scanner/files/openvassd.conf
deleted file mode 100644
index b218a4a27b02..000000000000
--- a/net-analyzer/openvas-scanner/files/openvassd.conf
+++ /dev/null
@@ -1,53 +0,0 @@
-#You can get detailed informations from https://linux.die.net/man/8/openvassd
-
-plugins_folder = /var/lib/openvas/plugins
-include_folders = /var/lib/openvas/plugins
-max_hosts = 30
-max_checks = 10
-
-#Resource friendly
-be_nice = no
-
-#Logfile
-logfile = /var/log/openvas/openvassd.messages
-
-log_whole_attack = no
-log_plugins_name_at_load = no
-dumpfile = /var/log/openvas/openvassd.dump
-cgi_path = /cgi-bin:/scripts
-
-#Turn off for push hard but increase false positive and slow down scans
-optimize_test = yes
-
-checks_read_timeout = 5
-network_scan = no
-non_simult_ports = 139, 445
-plugins_timeout = 320
-scanner_plugins_timeout = 36000
-
-#Push harder to target
-safe_checks = no
-
-auto_enable_dependencies = yes
-use_mac_addr = no
-nasl_no_signature_check = yes
-drop_privileges = no
-unscanned_closed = yes
-unscanned_closed_udp = yes
-vhosts = 
-vhosts_ip = 
-report_host_details = yes
-
-#Redis listening socket (must be same with redis socket)
-kb_location = /tmp/redis.sock
-
-timeout_retry = 3
-time_between_request = 0
-
-#Config File
-config_file = /etc/openvas/openvassd.conf
-
-#Certificates (default these are not needed here but setup-check script looking for them)
-cert_file = /var/lib/openvas/CA/servercert.pem
-key_file = /var/lib/openvas/private/CA/serverkey.pem
-ca_file = /var/lib/openvas/CA/cacert.pem
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-5.1.3.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-5.1.3.ebuild
deleted file mode 100644
index ece8f93f9010..000000000000
--- a/net-analyzer/openvas-scanner/openvas-scanner-5.1.3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake-utils systemd
-MY_PN="openvas-scanner"
-
-DESCRIPTION="A remote security scanner for Linux (OpenVAS-scanner)"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="https://github.com/greenbone/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="extras"
-
-DEPEND="
-	dev-db/redis
-	dev-libs/libgcrypt:0=
-	>=net-analyzer/openvas-libraries-9.0.3
-	net-libs/gnutls:=[tools]
-	net-libs/libssh:=
-	extras? ( dev-perl/CGI )"
-
-RDEPEND="
-	${DEPEND}
-	!net-analyzer/openvas-tools"
-
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	extras? ( app-doc/doxygen[dot]
-		  app-doc/xmltoman
-		  app-text/htmldoc
-		  dev-perl/SQL-Translator
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc8.patch"
-	"${FILESDIR}/${P}-nvt.patch"
-	"${FILESDIR}/${P}-cachedir.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-	# Fix for correct FHS/Gentoo policy paths for 5.1.3
-	sed -i "s*/doc/openvas-scanner/*/doc/openvas-scanner-${PV}/*g" "$S"/CMakeLists.txt || die
-	if use extras; then
-		doxygen -u "$S"/doc/Doxyfile_full.in || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr"
-		"-DLOCALSTATEDIR=${EPREFIX}/var"
-		"-DSYSCONFDIR=${EPREFIX}/etc"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use extras; then
-		cmake-utils_src_make -C "${BUILD_DIR}" doc
-		cmake-utils_src_make doc-full -C "${BUILD_DIR}" doc
-		HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /etc/openvas
-	doins "${FILESDIR}"/openvassd.conf "${FILESDIR}"/redis.conf.example
-
-	insinto /etc/openvas/sysconfig
-	doins "${FILESDIR}"/${MY_PN}-daemon.conf
-
-	newinitd "${FILESDIR}/${MY_PN}.init" ${MY_PN}
-	newconfd "${FILESDIR}/${MY_PN}-daemon.conf" ${MY_PN}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${MY_PN}.logrotate" ${MY_PN}
-
-	systemd_newtmpfilesd "${FILESDIR}/${MY_PN}.tmpfiles.d" ${MY_PN}.conf
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-
-	keepdir /var/lib/openvas/plugins
-}
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 1700d9421816..aeedaa6e04f9 100644
--- a/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild
+++ b/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake-utils flag-o-matic systemd toolchain-funcs
+inherit cmake flag-o-matic systemd toolchain-funcs
 
 MY_PN="openvas"
 MY_DN="openvassd"
@@ -31,9 +31,7 @@ DEPEND="
 "
 
 RDEPEND="
-	${DEPEND}
-	!~net-analyzer/openvas-scanner-5.1.3
-	!net-analyzer/openvas-tools"
+	${DEPEND}"
 
 BDEPEND="
 	sys-devel/bison
@@ -55,7 +53,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	# QA-Fix | Correct FHS/Gentoo policy paths for 6.0.1
 	sed -i -e "s*/doc/openvas-scanner/*/doc/openvas-scanner-${PV}/*g" "$S"/src/CMakeLists.txt || die
 	# QA-Fix | Remove !CLANG doxygen warnings for 6.0.1
@@ -82,21 +80,21 @@ src_configure() {
 	# Add release hardening flags for 6.0.1
 	append-cflags -Wno-format-truncation -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -fstack-protector
 	append-ldflags -Wl,-z,relro -Wl,-z,now
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	if use extras; then
-		cmake-utils_src_make -C "${BUILD_DIR}" doc
-		cmake-utils_src_make doc-full -C "${BUILD_DIR}" doc
+		cmake_build -C "${BUILD_DIR}" doc
+		cmake_build doc-full -C "${BUILD_DIR}" doc
 		HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
 	fi
-	cmake-utils_src_make rebuild_cache
+	cmake_build rebuild_cache
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	dodir /etc/openvas
 	insinto /etc/openvas
diff --git a/net-analyzer/ospd/Manifest b/net-analyzer/ospd/Manifest
index 16b01a37b29f..a62b289c04e8 100644
--- a/net-analyzer/ospd/Manifest
+++ b/net-analyzer/ospd/Manifest
@@ -1,5 +1,3 @@
-DIST ospd-1.3.2.tar.gz 39097 BLAKE2B 4c102e1e6857f89015666950e2d7a107bf81c861f9c6d4d74aab33f77585ea871e353aa95deb3f84a1bb4cd391f40121ca927835ebec9db2545eb8f606e96df7 SHA512 26ec0b45d74df687264ce2d5e42a6f51cfb982f8fe00863294b990ee8db819b7f54ebf3f095094c32c2bc91a51d987ac83f15f4bf15e931d4ffd215b72ac6bec
 DIST ospd-2.0.0.tar.gz 81645 BLAKE2B 4c0c7af3caf274ea9e6a43790eb1e9d386ce42d9976e5e9625b49ffe12d8db2e613109458dcc59f322bc00aee39a4a89045caf302182474d1fab4ca1c4ff1bcf SHA512 971b4b57c39844ef08a0ae56d4bf87f0440c993960b5ad37516c622ad41eb2ab30fabb9d0a05fd043a9a1d98e446eaab9d5018cc1607fd711c533475f4703012
-EBUILD ospd-1.3.2.ebuild 721 BLAKE2B 6c3700ac9a17745447f82f5468d7f077b8d5c98b658870ec58fd36ca0afc788446bde9a1374f2442fe465ca5dc829d16ca0681e67abfd155a04f288534a99c50 SHA512 29e7f73153030fe522041d1728872076e91507da86d6a468df00eee07dcf20c476650eb787780251891304f92f7cd5352980b85b7450bb3028531a7db3c9a9b0
-EBUILD ospd-2.0.0.ebuild 720 BLAKE2B ded312a73884a2a16ab8f94a98ae17a7b49a240f8c5cdc82baf6f6aa3980c3574888f728cc5cacb8748ac2cd7ae7d6325bb8aa65243eb697a2ab21471b329f88 SHA512 d82bc6fc8f91d3be650b0a1d1337e7967155e87bac293b748936bf8a8e16f64d5b37c9823a5eaa84604eb148142cffbf8261c96ae6af5712b6e59a2227cc32f4
+EBUILD ospd-2.0.0.ebuild 718 BLAKE2B ef6723da53087f451913458961ce208fdccb58fe0cbeb74752fd209f74b2285eac149cfae11f31a616b366f2d5c0349fa5e6f4e7d3f392865bf4428537809ebe SHA512 92223051ff305f555306311bc406c3736e591ddc9416430e10a7eba7ffc15cceed6ff65ba94fd81f193c0f7bbad8b6c0cafe6e2d8b1561868e8306c1e4ab0f29
 MISC metadata.xml 879 BLAKE2B 312903697fda388ac1a9b8c773f69836154e9ea62ee28c1b8248c3e751a6df14dd0f25e1f5d05cca297309aadc0785139ea35c87eab0f5d0f3639a17cb19b570 SHA512 4c276360cc13793e6f505ac0e0b767fa8af277a696a9e64aa37a671780d1b7fa82812d25c2be25dd4542201ab5083d2721746344f46fe548999d4b615c2ceadc
diff --git a/net-analyzer/ospd/ospd-1.3.2.ebuild b/net-analyzer/ospd/ospd-1.3.2.ebuild
deleted file mode 100644
index ce11b4a1aa1d..000000000000
--- a/net-analyzer/ospd/ospd-1.3.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-inherit distutils-r1
-
-DESCRIPTION="Base class for scanner wrappers,communication protocol for GVM"
-HOMEPAGE="https://www.greenbone.net/en/"
-SRC_URI="https://github.com/greenbone/ospd/archive/v1.3.2.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="extras"
-
-RDEPEND="
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/paramiko[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}"
-
-python_compile() {
-	if use extras; then
-		bash "${S}"/doc/generate || die
-		HTML_DOCS=( "${S}"/doc/. )
-	fi
-	distutils-r1_python_compile
-}
diff --git a/net-analyzer/ospd/ospd-2.0.0.ebuild b/net-analyzer/ospd/ospd-2.0.0.ebuild
index ae035362d7db..24f2cac6bb8d 100644
--- a/net-analyzer/ospd/ospd-2.0.0.ebuild
+++ b/net-analyzer/ospd/ospd-2.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Base class for scanner wrappers,communication protocol for GVM"
diff --git a/net-analyzer/packit/Manifest b/net-analyzer/packit/Manifest
index 8fc85c32d50f..f5df66321db9 100644
--- a/net-analyzer/packit/Manifest
+++ b/net-analyzer/packit/Manifest
@@ -1,10 +1,4 @@
-AUX packit-1.0-format.patch 1827 BLAKE2B 29afb31ec0f6d4952ea450cdb4c45b453099d1cef1fd07c4b98ad4d5c24d305cf8562e0c80f301b4e0ab14b5e48d4cbdb298b5185c0961426d2e28db448fbf5e SHA512 e82a0a917228cbd95520b89aedb8259c94b4442af4ae6b8bfe0b4ea3d182c542a0b7dcf58850855a9f2fdd7b15b9d6978fa3ef0581d39760199366b0ae58fa97
 AUX packit-1.0-noopt.patch 214 BLAKE2B a0f981b13b21f9e6f37f87f69e36aa41c68c6c3fefc3337a7864d7e554315de555304c0f76227870a0b498d5301438038c175f66d908e5cd470407c79717fe40 SHA512 a4d0bcdb8947d219459d1a5687cdcadb7f8e9792bad2adabe8a402d42e19c5ca9e6e808bd6d832490af271d58d555d18c5f4949758233b47f27d7e115d36e6f3
-AUX packit-1.0-nostrip.patch 125 BLAKE2B 52d77227d70a59c372b15757edb03f1d0d91c29695d844b9077e8755e7afcc6023e6f6affdbb3991cee723b98540afce0119c5d64a62f83d631e9493a498a541 SHA512 b0cad5051c5f242a526ccd0ee04c27dd80bd8ba48a79164d8dd57aeecca800c977c79e12c999fa971c4ce1a39585d6f8581fae9e3b35dc200ce40922cdb122f3
-AUX packit-1.0-overflow.patch 1444 BLAKE2B 6c5d13b342890effd4f2d0da982e6deb05adbf53b4b9e91e144286211a9e6b9825c719e91691eabd5ad152569bd0dfa18fe2be582606dfce8190072f1c06729e SHA512 7798177a770e81b0db4bd2cf879d17f1dd6a0ae763e4546f2136e5cfc0e49e22d7c0b8eac1bb4409a026a8a072baae93f4c5d1079a3ac0dfc589a2fad15ecdd1
-AUX packit-1.0-pcap-header.patch 448 BLAKE2B f7d1932dd9394d00bb866a6d312ab0c9d2a24dfdb3cc22bd96c631f46486a964d0d2c63f28e3e34a0a432e5e71654c25310f1155188bad12d462f22113f8be08 SHA512 a88baa7cde0e333fa604f219dbabe77db4452dcf3a8071a8e3e4977b45947ea7827b5746cd187ab32bf236777e415e4f7cb0b3d18ee6ef776783bdbf9e6ef886
-DIST packit-1.0.tgz 138367 BLAKE2B d3677368d248aefaefbf2fbee51035ade7923db8cdc4ee4b19fef97b606beacbef52e1e704de50bf0f042a38fa9ed1d4149ab1dbd5726aeeef7093786407e282 SHA512 cc7e957d2149edbc92d4d914c9f29aecb7945bab43f2df7435bc4c21a4724f92e9d99990683e4d301384117f79819f87f423eaa28dbef11b37a96c4aa40a1398
 DIST packit-1.6.1.tar.gz 52643 BLAKE2B 4b67c179140a21ec3dc8b5ae2e116a771fdbd860c3a880588a29346f04c956a80a59fcaf84f42ae6c505554e5b942964ed3f2d3a06d408e5b36850276832994a SHA512 462470bfc755dc33418ae0a65237d0dcbbe04609de710883134bcb1e13cff9212cd9a28e888b2e839a06a566fa080ecd6c6668414f1cac2bde337c81d1ac58a2
-EBUILD packit-1.0-r2.ebuild 788 BLAKE2B d3bd4f3e7da093d5900ca52f45509e8c0c050b8a8a1378cbcab40e5c519ce9b5f312289fa63b9464618427dddc88bac60eb00131a582206c8661490ce8f5b5eb SHA512 dccbb6d0e960d51db35ade7da0df07ac28e25aee0a2f55774e385d5c240c073922bb02e0f8da4417e595ac2a2f259bd062bb7921ac655696dfd355de7e37dd09
-EBUILD packit-1.6.1.ebuild 608 BLAKE2B 58fb813c1a9377029c06d370498d1bce4c0d9bf34df76d2404b67ab3d1cc9db269867e15e2e2f046c4738ca8f85e07b89fa197548091de92f96393d3f7243384 SHA512 84b472e05fbc9c2ab46c8e869119b685e8945e15c59634643bb5018176923a2bda02eba6e90735f52866f6794f791373dea6434444c263248bb53bc4338a75d9
+EBUILD packit-1.6.1.ebuild 654 BLAKE2B c5b20ee89d1b46a6009a06ac8574ceec62c3ca7d771bce7119b366cf15a89871e97fec4cced29cefb9020fdb2d7061ef56b5920e910b58bcaf23a799557da7ff SHA512 895b69e7667302cf82a94454b3b1b404a885d165716dfb2c57e4247b1bd0a1684491137ec1bf562338e6dd1a50e71000c76439dc83242e44634e442a4b3f7ea3
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/packit/files/packit-1.0-format.patch b/net-analyzer/packit/files/packit-1.0-format.patch
deleted file mode 100644
index 88a5edd92cdc..000000000000
--- a/net-analyzer/packit/files/packit-1.0-format.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-The original objective seems to have been to apply padding, but this
-is not done at all: instead, set a precision. -JeR
-
---- a/src/shape_arp_hdr.c
-+++ b/src/shape_arp_hdr.c
-@@ -94,7 +94,7 @@
-     if(format_ethernet_addr(ahdr_o.s_eaddr, s_neaddr) == 0)
-         fatal_error("Invalid sender ethernet address");
- 
--    snprintf(ahdr_o.shw_addr, 18, "%0X:%0X:%0X:%0X:%0X:%0X",
-+    snprintf(ahdr_o.shw_addr, 18, "%.2X:%.2X:%.2X:%.2X:%.2X:%.2X",
-         s_neaddr[0], s_neaddr[1], s_neaddr[2], s_neaddr[3], s_neaddr[4], s_neaddr[5]);
- 
-     if(ahdr_o.r_paddr == NULL)
-@@ -139,7 +139,7 @@
-     if(format_ethernet_addr(ahdr_o.r_eaddr, r_neaddr) == 0)
-         fatal_error("Invalid receiver ethernet address");
- 
--    snprintf(ahdr_o.rhw_addr, 18, "%0X:%0X:%0X:%0X:%0X:%0X",
-+    snprintf(ahdr_o.rhw_addr, 18, "%.2X:%.2X:%.2X:%.2X:%.2X:%.2X",
-         r_neaddr[0], r_neaddr[1], r_neaddr[2], r_neaddr[3], r_neaddr[4], r_neaddr[5]);
- 
-     if(libnet_build_arp(
---- a/src/shape_ethernet_hdr.c
-+++ b/src/shape_ethernet_hdr.c
-@@ -56,7 +56,7 @@
-         if(format_ethernet_addr(ehdr_o.s_addr, us_addr) == 0)
-             fatal_error("Invalid source ethernet address");
-     
--    snprintf(ehdr_o.shw_addr, 18, "%0X:%0X:%0X:%0X:%0X:%0X",
-+    snprintf(ehdr_o.shw_addr, 18, "%.2X:%.2X:%.2X:%.2X:%.2X:%.2X",
-         us_addr[0], us_addr[1], us_addr[2], us_addr[3], us_addr[4], us_addr[5]);
- 
-     if(ehdr_o.d_addr == NULL && injection_type == ETHERTYPE_ARP)
-@@ -71,7 +71,7 @@
-     if(format_ethernet_addr(ehdr_o.d_addr, ud_addr) == 0)
-         fatal_error("Invalid destination ethernet address");
- 
--    snprintf(ehdr_o.dhw_addr, 18, "%0X:%0X:%0X:%0X:%0X:%0X",
-+    snprintf(ehdr_o.dhw_addr, 18, "%.2X:%.2X:%.2X:%.2X:%.2X:%.2X",
-         ud_addr[0], ud_addr[1], ud_addr[2], ud_addr[3], ud_addr[4], ud_addr[5]);
- 
-     if(libnet_build_ethernet(
diff --git a/net-analyzer/packit/files/packit-1.0-nostrip.patch b/net-analyzer/packit/files/packit-1.0-nostrip.patch
deleted file mode 100644
index 672f48ca1fd6..000000000000
--- a/net-analyzer/packit/files/packit-1.0-nostrip.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -450,7 +450,6 @@
- 
- 
- all:
--	strip @BINS@
- 	cp @BINS@ $(top_srcdir)
- 
- clean:
diff --git a/net-analyzer/packit/files/packit-1.0-overflow.patch b/net-analyzer/packit/files/packit-1.0-overflow.patch
deleted file mode 100644
index 3adf31a6bb82..000000000000
--- a/net-analyzer/packit/files/packit-1.0-overflow.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/src/utils.c
-+++ b/src/utils.c
-@@ -137,7 +137,7 @@
- #endif
- 
-     va_start(va, msgp);
--    vsnprintf(msg, 256, msgp, va);
-+    vsnprintf(msg, 255, msgp, va);
- 
-     msg_len = strlen(msg);
- 
---- a/src/exit.c
-+++ b/src/exit.c
-@@ -36,7 +36,7 @@
-         while(1)
-         {
-             fprintf(stderr, "\n\nWould you like to quit? (y/n): ");
--            fgets(a, 16, stdin);
-+            fgets(a, 2, stdin);
- 
-             if(!strncasecmp(a, "Y", 1))            
-                 break;
---- a/src/define_defaults.c
-+++ b/src/define_defaults.c
-@@ -36,7 +36,7 @@
-     rand_d_port = (p_mode == M_TRACE) ? 1 : 0;
-     r_timeout = 1;
-     burst_rate = 1;
--    hwaddr_p[17] = 0;
-+    /* hwaddr_p[18] = 0; */
-     init_type = 1;
-     interval_sec = 1;
-     interval_usec = 0;
---- a/src/inject_defs.h
-+++ b/src/inject_defs.h
-@@ -132,9 +132,9 @@
-     u_int16_t rand_d_addr;
- 
-     u_int8_t *s_addr;                   /* source ethernet address string */
--    u_int8_t shw_addr[17];
-+    u_int8_t shw_addr[18];
-     u_int8_t *d_addr;                   /* destination ethernet address string */
--    u_int8_t dhw_addr[17];
-+    u_int8_t dhw_addr[18];
- } ehdr_o;
- 
- struct arphdr_opts
-@@ -153,8 +153,8 @@
-     u_int8_t *r_eaddr;                  /* receiver ethernet address */
-     u_int16_t rand_r_eaddr;
- 
--    u_int8_t shw_addr[17];
--    u_int8_t rhw_addr[17];
-+    u_int8_t shw_addr[18];
-+    u_int8_t rhw_addr[18];
- } ahdr_o;
- 
- libnet_t *pkt_d;
diff --git a/net-analyzer/packit/files/packit-1.0-pcap-header.patch b/net-analyzer/packit/files/packit-1.0-pcap-header.patch
deleted file mode 100644
index 6cda0a8e65ce..000000000000
--- a/net-analyzer/packit/files/packit-1.0-pcap-header.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/globals.h
-+++ b/src/globals.h
-@@ -31,7 +31,7 @@
- #include <libnet.h>
- #include <pcap.h>
- #include <sys/types.h>
--#include <net/bpf.h>
-+#include <pcap-bpf.h>
- #include <signal.h>
- #include <time.h>
- #include <stdio.h>
---- a/src/main.h
-+++ b/src/main.h
-@@ -26,7 +26,7 @@
- #include <libnet.h>
- #include <pcap.h>
- #include <sys/types.h>
--#include <net/bpf.h>
-+#include <pcap-bpf.h>
- #include <signal.h>
- #include <time.h>
- #include <stdio.h>
diff --git a/net-analyzer/packit/packit-1.0-r2.ebuild b/net-analyzer/packit/packit-1.0-r2.ebuild
deleted file mode 100644
index 7df31e37cab7..000000000000
--- a/net-analyzer/packit/packit-1.0-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="network auditing tool that allows you to monitor, manipulate, and inject customized IPv4 traffic"
-HOMEPAGE="http://packetfactory.openwall.net/projects/packit/"
-SRC_URI="${HOMEPAGE}downloads/${P}.tgz"
-
-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}"
-
-src_prepare(){
-	epatch \
-		"${FILESDIR}"/packit-1.0-format.patch \
-		"${FILESDIR}"/packit-1.0-noopt.patch \
-		"${FILESDIR}"/packit-1.0-nostrip.patch \
-		"${FILESDIR}"/packit-1.0-overflow.patch \
-		"${FILESDIR}"/packit-1.0-pcap-header.patch
-}
-
-src_install() {
-	default
-	dodoc docs/*
-}
diff --git a/net-analyzer/packit/packit-1.6.1.ebuild b/net-analyzer/packit/packit-1.6.1.ebuild
index cd4fb1dfab52..ddeeeb77d2bf 100644
--- a/net-analyzer/packit/packit-1.6.1.ebuild
+++ b/net-analyzer/packit/packit-1.6.1.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
@@ -6,11 +6,11 @@ inherit autotools
 
 DESCRIPTION="network packet generator and capture tool"
 HOMEPAGE="https://github.com/resurrecting-open-source-projects/packit"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+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"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="
 	net-libs/libnet:1.1
diff --git a/net-analyzer/pathload/Manifest b/net-analyzer/pathload/Manifest
index 07460641ee59..aae018268905 100644
--- a/net-analyzer/pathload/Manifest
+++ b/net-analyzer/pathload/Manifest
@@ -1,4 +1,4 @@
-AUX pathload-1.3.2-make.patch 509 BLAKE2B b5780c9810d9040c946476da2cde878f79b323dc5aa18a8021f26de766b4ae623b64d4bc0462b42c4ded3f43ac088827a6f27b28ef15ba26b685fb8a6eb11d2f SHA512 c71e2df04a8d21826460c474f69eaf46ff1eb3ed0e98b70df38d4503a87cd5eb021d21c8eadf016d4b2c684b7beeb2de8f933b7765712222819b27e2a64f770c
+AUX pathload-1.3.2-make.patch 509 BLAKE2B 317ae2327725e2405802f08110055c970d430db0710ed82594bea5d1148bdb1f224ee335692d73713f8efcb2032d0efe54fba40a474f2f20f23fbefa76322c7e SHA512 b7e4ae8a952f9d0e8cc1ff038bbecda8164817da0d38a3d73b55cecadc550784731aa2664e2f63322b7a38fe35440d01ad12663409d7b4b67d8c5a25f844a234
 DIST pathload-1.3.2.tar.gz 68524 BLAKE2B 0ea27000647c292e4d04c92574dc2d63fcdd9c16be57d9af49df8651e6f8905561c70f48b9854c69a16c4b3d16fc8bec61ffed3cbbdad7e1f18e2209e9b4f199 SHA512 9fef51c86b8aa2c28a33effe5a5bff36eebc0812f6d6744fac93df46ec0cbce8f5977d24b6ac52442386fb263550fe46e639c4a3ff4612fe92ad09d6595e5d7f
-EBUILD pathload-1.3.2.ebuild 596 BLAKE2B cc165025b8ae9fff3aac41de27b5a2a2dba6fd47a9fc0121d8b782b96fc46462c03c532745f854864083c2b3130a9e6f44ccfd400a02031eac7ddd2555b0946d SHA512 0b829bfc93f7df3fbdab2b56dab95f9ed6665868094d55f335b8e438ec1848fc0fe60ea14dc08ec37680b9ca1733e346624cc0d961131d0e9d60acc4cec1ac95
+EBUILD pathload-1.3.2-r1.ebuild 610 BLAKE2B 77da658a903ba4d575d266be9ae035e9986751cc1377c4185232c547349536bc765c65b87b307b7231fd92dad535150c34ae558d75e2bbcde38bb841141e2905 SHA512 f40a17da4ae2e6995079a658b2008a172057c9fda72f485031461bbc211bab041b82920ac85b937fce898925059338cdc6b5cfcd73d3e03459448f7c8bb999c5
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/pathload/files/pathload-1.3.2-make.patch b/net-analyzer/pathload/files/pathload-1.3.2-make.patch
index f97848839627..451b0eadf538 100644
--- a/net-analyzer/pathload/files/pathload-1.3.2-make.patch
+++ b/net-analyzer/pathload/files/pathload-1.3.2-make.patch
@@ -9,11 +9,11 @@
  
  pathload_snd: $(SOBJS)
 -	 $(CC) $(SOBJS) -o pathload_snd $(LIBS) $(LDFLAGS) $(CFLAGS)
-+	 $(CC) $(LDFLAGS) $(CFLAGS) $(SOBJS) -o pathload_snd $(LIBS)
++	 $(CC) $(CFLAGS) $(LDFLAGS) $(SOBJS) -o pathload_snd $(LIBS)
  
  pathload_rcv: $(ROBJS)
 -	 $(CC) $(ROBJS) -o pathload_rcv $(LIBS) $(LDFLAGS) $(CFLAGS)
-+	 $(CC) $(LDFLAGS) $(CFLAGS) $(ROBJS) -o pathload_rcv $(LIBS)
++	 $(CC) $(CFLAGS) $(LDFLAGS) $(ROBJS) -o pathload_rcv $(LIBS)
  
  pathload_rcv.o pathload_rcv_func.o: pathload_gbls.h pathload_rcv.h
  
diff --git a/net-analyzer/pathload/pathload-1.3.2.ebuild b/net-analyzer/pathload/pathload-1.3.2-r1.ebuild
index 4a4b5881535d..27b8252d8e52 100644
--- a/net-analyzer/pathload/pathload-1.3.2.ebuild
+++ b/net-analyzer/pathload/pathload-1.3.2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=7
+inherit toolchain-funcs
 
 DESCRIPTION="Non-intrusive utility for estimation of available bandwidth of Internet paths"
-HOMEPAGE="http://www.cc.gatech.edu/fac/constantinos.dovrolis/bw-est/pathload.html"
+HOMEPAGE="https://www.cc.gatech.edu/fac/constantinos.dovrolis/bw-est/pathload.html"
 SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -13,10 +13,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 S=${WORKDIR}/${PN}_${PV}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.2-make.patch
+)
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-make.patch
+src_configure() {
 	tc-export CC
+	default
 }
 
 src_install() {
diff --git a/net-analyzer/pbnj/Manifest b/net-analyzer/pbnj/Manifest
index bebe4eb00778..c1081b148282 100644
--- a/net-analyzer/pbnj/Manifest
+++ b/net-analyzer/pbnj/Manifest
@@ -1,3 +1,5 @@
+AUX pbnj-2.04-ipv4_sort.patch 355 BLAKE2B 86081918c4077cefb114e75009c18d43e16e1debdd27032d4baec9cf5408df8b99377714e154fc4274feca019438e5635736309a69c4d14e94908b737963c198 SHA512 cecdc0ad7348682614ffb22a53a804000a2004dcef2d1c9d172b3fd9a684348dd07134ad1de6c421009d4c67b9571f8ca6dc6eb3095a604e2def39401cdf365e
 DIST pbnj-2.04.tar.bz2 57438 BLAKE2B 43b057fb95e74cd7f4d8d11e905fb6c3734971295db13116e94250a7665d28f5a9bb288b5ba07f50c7426a9a90664ea90bb790ad0aea87c24838398faa3ec0f8 SHA512 7f486c4e16a891d90ff10fa80b85ba68346f37152c5f932832c3760985f0dff5c58e0f23309ed395f0c06ff4287bf4af66d1b39de7f2838a868e6b8335afe206
+EBUILD pbnj-2.04-r1.ebuild 732 BLAKE2B 58eff20a310ae7362cd058b62922722a4dfa45efdc9d038890ad74d94a6c44898fe430932ce59b913ddbf892e0748b261a9023960201891a7e1459567bebff1c SHA512 2030ef6ce558c502ef15f092f1cf16c9b91a957dbce59dfa456be71eb962c2f2fe42c0d155d0817024e487d40fa1be65e323a446bc4eaa09c7075ec61c0b56fa
 EBUILD pbnj-2.04.ebuild 560 BLAKE2B bc62b1c436dcd802cb418520ab05d4ab48249a1eea68ed833da533305728ef403972c6fe969e586513c7b28b3ea34c8118cac6805835747310dd76bbbbbe5afe SHA512 74a9321c4118429e2014596f3802d0840d100440495f5a1a657d4d870d76cde1172fcedbdff6f080f2e5baf3a4f3c2407f5a7b70145cb221b8144cc90f460248
 MISC metadata.xml 364 BLAKE2B 807335b7d101c779cd839046363f44b2d208636286b4e7013efcc7c2fe257d82391fd5151c098d9bba49bfb371a9cb78759b5280948331ba9b598416fbf17c93 SHA512 cbd77dbb09b911704cd44e430b7513254998eb0fd1853d2c6a158d8c72145df56e71a54229a8c540769bb2cd502195249e23cf3fc38f80268643389617e42b2b
diff --git a/net-analyzer/pbnj/files/pbnj-2.04-ipv4_sort.patch b/net-analyzer/pbnj/files/pbnj-2.04-ipv4_sort.patch
new file mode 100644
index 000000000000..9b9fd8237320
--- /dev/null
+++ b/net-analyzer/pbnj/files/pbnj-2.04-ipv4_sort.patch
@@ -0,0 +1,11 @@
+--- a/t/02parser.t
++++ b/t/02parser.t
+@@ -40,7 +40,7 @@
+ 
+     #TESTING IPV4_SORT
+     my @hosts = (HOST3, HOST1, HOST4, HOST2);
+-    is_deeply([$np->ipv4_sort(@hosts)],[HOST1, HOST2, HOST3, HOST4], 'Testing ipv4_sort');
++    is_deeply([$np->addr_sort(@hosts)],[HOST1, HOST2, HOST3, HOST4], 'Testing addr_sort');
+     
+ 
+     #TESTING ALL_HOSTS()
diff --git a/net-analyzer/pbnj/pbnj-2.04-r1.ebuild b/net-analyzer/pbnj/pbnj-2.04-r1.ebuild
new file mode 100644
index 000000000000..22d8615ff550
--- /dev/null
+++ b/net-analyzer/pbnj/pbnj-2.04-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit perl-module
+
+DESCRIPTION="A tool for running Nmap scans and diff'ing the results"
+HOMEPAGE="http://pbnj.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pbnj/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-perl/DBD-SQLite
+	dev-perl/DBI
+	dev-perl/File-HomeDir
+	dev-perl/File-Which
+	dev-perl/Nmap-Parser
+	dev-perl/Shell
+	dev-perl/Text-CSV_XS
+	dev-perl/XML-Twig
+	dev-perl/YAML
+"
+RDEPEND="
+	${DEPEND}
+	net-analyzer/nmap
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.04-ipv4_sort.patch
+)
+
+src_prepare() {
+	default
+
+	mv t/04change.t{,his-test-fails} || die
+	mv t/05output.t{,his-test-fails} || die
+}
diff --git a/net-analyzer/pinger/Manifest b/net-analyzer/pinger/Manifest
index 7186ddb67d32..2855cd61d867 100644
--- a/net-analyzer/pinger/Manifest
+++ b/net-analyzer/pinger/Manifest
@@ -4,5 +4,5 @@ AUX pinger-0.33-gentoo.patch 2488 BLAKE2B a94bf31ad31089f5a8686cc316437984c57067
 DIST pinger-0.32e.tar.gz 239002 BLAKE2B d8fb905eac4cc84271196fb96503be512c18356668ddef943af028eac9aeb61a0836d3e85ee1c45546a0f88725e0a883947d5c3f38030b55b857d4be13af196f SHA512 8a6cebe9b37399e2e84eead3b386b999212904ecffb1fc951b4165295b278690217f35d20830e1f1440b94567d9d5d3423d37ee6e9200173be9aacefb68a87f7
 DIST pinger-0.33.tar.gz 247827 BLAKE2B 6139044be634438945c92a431b97276b5556b513a948a675d6d70c73e4e22d08a58b9cf6607170f804354c18371af54a222b0e064cc1c8275ba77f67ddbd6699 SHA512 fff07599ef91fbdcff9be7806eca57a71e8e6fac7e9afc67c4147e6246b0bcdadf379de28f87054dbe7c409955c0e0ddeae7f529e954231bea0cfb39e4e29bc1
 EBUILD pinger-0.32e.ebuild 963 BLAKE2B 1c0423ba478c8e01343d5a6e95c5fe7d3a26242dd800f548ff11b6b49e9fedd00581c66d9dd2cd5171e4548b27ad0917b2585b932b1a2512c10221e21ad6c4ea SHA512 fec43c39c305884e437f13b7ee4d9f752ac3b2e650e1778a676fe7099ee421b72e0dfd72a2be72d8351267b6b6faf02f7e8fce675762aa573dd2d198ae05cbae
-EBUILD pinger-0.33.ebuild 1052 BLAKE2B ec080716dd41cee95f87144c0a3bb63d44e0c371cb3a93e260c35de2e950b43d643e5b5af473cfa8f959a75aec182b00795d8af65649c869cddd564e0532c2f6 SHA512 2fc489e5dcec38880211f2bce2938a8e0b1b33443b5ede5cb176bd6384c02da7872695c66d8c00ee0ee51580cacafc8ccf56103d84dc11586c04e51030a0dc6b
+EBUILD pinger-0.33.ebuild 1081 BLAKE2B d768a42ed1b35b98a0d627aa731e6ab7d9fa60aaeab66676bb85d2d57d769147f7062c3ff0aae2c0947efa7daf3fbc6e4895af887fd697d8d15cfa0029a42862 SHA512 461377d4bf459c2be3bb685ff9b704d3d9fdf1075bde258201d7a6a60b20e45ce223b76df09e509aa41a25e68d293812f23507595e81def5402eda4693053ab9
 MISC metadata.xml 477 BLAKE2B 63658143ec172ecc577c273faae8655ca0e12b4c2e4b518ed7a046875189485904955c4313e69d63bf158a0092b6338fd9673461ccfc358f716e3446e207f04a SHA512 ee9a6e27f4467c86d4f3b2069cc0202f249d2c1d4aa027b6c0a87dad61f7d6b9097faf64848a5d4b5d88300fb5c29cdb7532cb1288bca017d178f3d1e4cd95f0
diff --git a/net-analyzer/pinger/pinger-0.33.ebuild b/net-analyzer/pinger/pinger-0.33.ebuild
index 55c82f856862..2130dbcbe717 100644
--- a/net-analyzer/pinger/pinger-0.33.ebuild
+++ b/net-analyzer/pinger/pinger-0.33.ebuild
@@ -7,7 +7,7 @@ inherit autotools eutils flag-o-matic
 
 DESCRIPTION="Cyclic multi ping utility for selected adresses using GTK/ncurses"
 HOMEPAGE="http://aa.vslib.cz/silk/projekty/pinger/"
-SRC_URI="${HOMEPAGE}download/${P}.tar.gz"
+SRC_URI="http://aa.vslib.cz/silk/projekty/pinger/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index 3d6ba3bbeebf..0c720fb5c032 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -1,11 +1,16 @@
+AUX pmacct-1.7.3-nDPI-3.0.patch 1157 BLAKE2B e7beb25fa1b239193d4c4deb7521b1b03051335901e61ee68b198e8ef73cefe193884111f605cbd38f444cb5380c28529a815b4b055fceac8e467da59ff9f2db SHA512 323012c63ed16ce3fe7a3684b84cc6fdcf9412fa9ce2cead2600459ee500ae60a0e5603805ef9c66b7d6e3f4b7d1b779b51b45494ce91e4798035956621eb8fe
+AUX pmacct-1.7.4--Werror.patch 327 BLAKE2B 1b77ca15ef64a48ca6b477be9f37fa7b88d79e7fedb47895648b6637e9af9e38c959b8838d28d1370dd11b4c722d2b18adabcdd72c8e074dbc10467b770ea6de SHA512 06e1cce962022e51c960881c6f169c91605c5ed597960085f38b5c9fffa4056813014c08070ba7f016cb0f6c449038df9666e5f0d7ab7879563d2dfdc53d2b0a
 AUX pmacctd-conf.d 153 BLAKE2B 10329deaac64fb5e03bf673c806ad691fb00579d16c77b05aa73662b5e187a31c25da38afb3be853434900ad65103bef3b9d1d9c3b24e0f241a98e4c9b6696b8 SHA512 1637316833db6e2a7c2d531deb4d68d647948bc03da8aecf0c6a34dd2f0c58d58d8473270e6096cf232e98c07946bac265161d4a8577def6cb72a4e8c9778c31
 AUX pmacctd-init.d 839 BLAKE2B 06d09dd80b526c9e12579e0ee2f76de96d91fef6f533727c5f6862a4a09be323fca4614be2f800f76195661cea5d52a3e6a316640ff4b853de963192c08f80d5 SHA512 c340e62eebfc15ee72591178451d46052e03ef1656a0b81a4b53c02b69df1e5a365742ddf98d9f7f0a8de1345b6a111b8e5ee9009f33fed2a3204344a15690a3
 DIST pmacct-1.6.2.tar.gz 1311678 BLAKE2B 123629ca2e5e58bb4e684001b1c6d2d510e18450eed1c6e45bbe79ec7bb37072ba9b844fe0d8826a7923d0b09cf6923ea87d4e22fb2f251e7ebb9744d1c59b93 SHA512 8495f97752ae586fd842eed49ce91db3e4753133f7d380d067e7df153abeea469e5126800074e9071cb7227a3f1df64d4642dfece624fbbfa39b4537fde38b46
 DIST pmacct-1.7.1.tar.gz 1392360 BLAKE2B 75a4dda461c2fe643c24a901c19efacf325d1922bcda503a1ff41fe0b6c4178732d476b479875e9e0ba34872dbd86b8d8b2087471148f10e202f57c4a212f2fd SHA512 6a5d75522b9197b324907598ee4ba22bbda96b45e10f62df2ae507e23faac927af5468f587deab08d1e0f3f6422c609d106dcf30fa7bf16eb215bb35ea6aa08c
 DIST pmacct-1.7.2.tar.gz 1416302 BLAKE2B 5d6f9c5849c07c7bdd3b6251b2611935ff558ca393d2cc0d21e5e681b0069b3a5bb4a985a9dc59b62b8b4ed697ecbd4cbb71f0aba42ce8d1527187b98d2e90d3 SHA512 ffdc63e96fc6af6f5d531243bc0aec0925663d8e91e83ada275f8e9a969dcf85cebd06b17ae2c796722bb209602d5b2bc487757ec736a740a8f33698d93a8675
 DIST pmacct-1.7.3.tar.gz 1467237 BLAKE2B a2fb627df9f61f91c69a9333a968485695b45c8ebe812e11ba250185a5e93f262954290d7ee41789fb13f7f5c5ef336294be83c8d91adcd0fc3c348485e515af SHA512 09d0e6721760035112cb0c7936fe177f7858b19fa1df2c7da84822dc816413e7c6bace35fe45ad32930961183d61f9e4f3a4879747be45f47ab658a3e0f055b2
+DIST pmacct-1.7.4.tar.gz 1581213 BLAKE2B 3835abc91947af083932e01b828c2324f90595c973fdde9d9f4034dc7d03e12fad6bbe6e91e1462ec36963ccb41a5a740159f531d7e1929f4cd8d994b89a58a1 SHA512 780b6cc25562fb7b5a1f55b48ce9719b36c1ee0d9ee2b6db8d7f238cd5d9f204938313b13e3ff3f62c7b9b179279f18314eba38ad787ffc346a4b217da239ca1
 EBUILD pmacct-1.6.2.ebuild 1790 BLAKE2B be2fe64588677200a54a4866e2946cb5516fb65d4f1ac0bef07287796321d3832c4acba1284f8bc285bbacf6513493a297880bccca350e6d7286ef6569e1d6e6 SHA512 6db9673c145cec1da55e4cd18428f64fb334066eb0a5794adc6127a0ba27144301237aa6e30e1c4a93ce892ad4306369da46e9572b41430df7a776080b7edcc0
 EBUILD pmacct-1.7.1-r1.ebuild 2131 BLAKE2B 93f73d535296d1c3634968a262a1d4aea8b7e27150310ed051a5e7a0bd42c95f09452b7bd0116521763b8acf890a71742ce0772c0468eadfb5dd17717ff5750c SHA512 e2cb9688373c62963391d989f99b909ae246d5b890333d7352871abe9f8feda20bcc046e29777bf0002fee5e6952f1ec49b6ea0decd927b240c919d8c4b2f5cf
 EBUILD pmacct-1.7.2-r1.ebuild 2125 BLAKE2B 8a2d62e19cf7e5c6f2de12956cbdda845825648b18c19c4d37190e1cbdd4cc0dd926e8c2330b5bc5acbaee2c989cbbb8f928d31fbe1566fa049549972a9f5828 SHA512 55d6e8b369a0f734e81175829472b2312cf7e24a23acfb3609a76adcbe3f72e2df4ff6460b87fc4c381ea78cd95f446ce26f956b35e4a46d9ebce8ec1ac597e1
-EBUILD pmacct-1.7.3.ebuild 2107 BLAKE2B 1b41bedd1d6f0e7f4968941597162eca42c246900b2db0ea466d81070b6b9d2b4b3ebf33740a55ce2dcb84f79f0d82d4451db63e48bf543ebed4f2d8aee36079 SHA512 534a7a873a1308faabb8c5f4dea983e4a62cc5bf72fbf58830982e0a7dce945dbd108db5a79806ea13b6ad19353054a0a147e43666861a66a556d5481c610f7a
+EBUILD pmacct-1.7.3-r2.ebuild 2220 BLAKE2B 15f3fab589baa6544681cfff7f5d0a7c8582eacc4ad880764b9dc8702bc56fc19c7e128304f555e1695173c8a98b25550a4c8d439cc2e254bb86071cc0e468e8 SHA512 54ffea328edcc50c4cc4212ca044db234defa0287db3fad4e07f9e3ac103af96bf6d3c2c2322b321e6bae59cc92ec87f8d81a3144ca43aad8c2e699565c7672c
+EBUILD pmacct-1.7.4.ebuild 2261 BLAKE2B 905115a9a89b599dca598d388828b32ea3806fffb7754aa137822a712d444895f0a9f213fdc2885a258b42e60c806b4a253d4f1aa7f5622fe20e21b37eccb717 SHA512 89766a9ba588580b41a8292f41391e7c721c3af59ee299731eb041975b227f4d68bdaafa78062a47ea28e910703de6523660597545c6de119bc5c0c506d22978
+EBUILD pmacct-999999.ebuild 2268 BLAKE2B dd835c166e6f16ce4e86a9aece0b181bd6814d8bafd5bb36201ea350b38ac8612afca39af2cabf19f06f41d6e0faac3e3538fde792ab58b0f8a7ce16d3282a76 SHA512 f9f3aec4aad756675440e4936c5b01442159ed8da7cab5351048989124ea3e0bae42cc2a56ffd6bfe156445bf4214c5869613f954ad9d2052b09237f69d6f0a0
 MISC metadata.xml 1424 BLAKE2B 75ce1e74993587289adbef0841807d758f0a587bc5b0429cb03a86be690d49479a2cf37211006ae905473528f3f4714ec2827e5bc556a4bcaf368215f97db7b8 SHA512 ddfd0eaac09d66640660baffe80ca83911000632416602eb258b2c01e630ada343ebeff7191c53fe71e4d5e658c94eac9a95bf4527a9ba40ee674ffa9442d856
diff --git a/net-analyzer/pmacct/files/pmacct-1.7.3-nDPI-3.0.patch b/net-analyzer/pmacct/files/pmacct-1.7.3-nDPI-3.0.patch
new file mode 100644
index 000000000000..9e6c618fe443
--- /dev/null
+++ b/net-analyzer/pmacct/files/pmacct-1.7.3-nDPI-3.0.patch
@@ -0,0 +1,28 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -955,6 +955,7 @@
+       CFLAGS="$_save_CFLAGS"
+     ])
+     PKG_CHECK_MODULES([NDPI26], [libndpi >= 2.6], [AC_DEFINE(WITH_NDPI26, 1)], [AC_DEFINE(WITH_NDPI, 1)])
++    PKG_CHECK_MODULES([NDPI30], [libndpi >= 3.0], [AC_DEFINE(WITH_NDPI30, 1)], [AC_DEFINE(WITH_NDPI, 1)])
+     ;;
+   no)
+     AC_MSG_RESULT(no)
+--- a/src/ndpi/ndpi.c
++++ b/src/ndpi/ndpi.c
+@@ -374,10 +374,14 @@
+   if (flow->detection_completed || flow->tcp_finished) {
+     if (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN)
+ #ifdef WITH_NDPI26
++#ifdef WITH_NDPI30
++	  flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow, 1, workflow->prefs.protocol_guess);
++#else
+       flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow, workflow->prefs.protocol_guess);
++#endif /* WITH_NDPI30 */
+ #else
+       flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow);
+-#endif
++#endif /* WITH_NDPI26 */
+ 
+     if (workflow->prefs.protocol_guess) {
+       if (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN && !flow->guess_completed) {
diff --git a/net-analyzer/pmacct/files/pmacct-1.7.4--Werror.patch b/net-analyzer/pmacct/files/pmacct-1.7.4--Werror.patch
new file mode 100644
index 000000000000..e2e9685e1326
--- /dev/null
+++ b/net-analyzer/pmacct/files/pmacct-1.7.4--Werror.patch
@@ -0,0 +1,14 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1109,9 +1109,9 @@
+ 			AC_MSG_RESULT(yes)
+ 			tmp_CFLAGS=`echo $CFLAGS | sed 's/O2/O0/g'`
+ 			CFLAGS="$tmp_CFLAGS"
+-			CFLAGS="$CFLAGS -g -Wall -Werror"
++			CFLAGS="$CFLAGS -g -Wall"
+ 		else
+-			CFLAGS="$CFLAGS -Wall -Werror"
++			CFLAGS="$CFLAGS -Wall"
+ 			AC_MSG_RESULT(no)
+ 		fi
+ 	],
diff --git a/net-analyzer/pmacct/pmacct-1.7.3.ebuild b/net-analyzer/pmacct/pmacct-1.7.3-r2.ebuild
index 5887b587804d..29e8537602fb 100644
--- a/net-analyzer/pmacct/pmacct-1.7.3.ebuild
+++ b/net-analyzer/pmacct/pmacct-1.7.3-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit flag-o-matic toolchain-funcs
+inherit autotools flag-o-matic toolchain-funcs
 
 DESCRIPTION="A network tool to gather IP traffic information"
 HOMEPAGE="http://www.pmacct.net/"
@@ -32,7 +32,7 @@ RDEPEND="
 		<dev-libs/mongo-c-driver-0.98
 	)
 	mysql? ( dev-db/mysql-connector-c:0= )
-	ndpi? ( net-libs/nDPI )
+	ndpi? ( >=net-libs/nDPI-2.4:= )
 	nflog? ( net-libs/libnetfilter_log )
 	postgres? ( dev-db/postgresql:* )
 	rabbitmq? ( net-libs/rabbitmq-c )
@@ -43,12 +43,20 @@ DEPEND="
 	${RDEPEND}
 	virtual/pkgconfig
 "
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.3-nDPI-3.0.patch
+)
 
 DOCS=(
 	CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE
 	docs/INTERNALS docs/PLUGINS docs/SIGNALS
 )
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	tc-export CC AR RANLIB
 	append-cppflags -DMYSQL_SERVER_VERSION=99999999
diff --git a/net-analyzer/pmacct/pmacct-1.7.4.ebuild b/net-analyzer/pmacct/pmacct-1.7.4.ebuild
new file mode 100644
index 000000000000..159a6edac6d8
--- /dev/null
+++ b/net-analyzer/pmacct/pmacct-1.7.4.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="A network tool to gather IP traffic information"
+HOMEPAGE="http://www.pmacct.net/"
+SRC_URI="http://www.pmacct.net/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="
+	64bit +bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mongodb mysql
+	ndpi nflog plabel postgres rabbitmq sqlite +st-bins +traffic-bins zmq
+"
+REQUIRED_USE="
+	?? ( geoip geoipv2 )
+	kafka? ( jansson )
+	rabbitmq? ( jansson )
+"
+
+RDEPEND="
+	net-libs/libpcap
+	geoip? ( dev-libs/geoip )
+	geoipv2? ( dev-libs/libmaxminddb )
+	jansson? ( dev-libs/jansson )
+	kafka? ( dev-libs/librdkafka )
+	mongodb? (
+		>=dev-libs/mongo-c-driver-0.8.1-r1
+		<dev-libs/mongo-c-driver-0.98
+	)
+	mysql? ( dev-db/mysql-connector-c:0= )
+	ndpi? ( >=net-libs/nDPI-2.4:= )
+	nflog? ( net-libs/libnetfilter_log )
+	postgres? ( dev-db/postgresql:* )
+	rabbitmq? ( net-libs/rabbitmq-c )
+	sqlite? ( =dev-db/sqlite-3* )
+	zmq? ( >=net-libs/zeromq-4.2.0:= )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.3-nDPI-3.0.patch
+	"${FILESDIR}"/${PN}-1.7.4--Werror.patch
+)
+
+DOCS=(
+	CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE
+	docs/INTERNALS docs/PLUGINS docs/SIGNALS
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC AR RANLIB
+	append-cppflags -DMYSQL_SERVER_VERSION=99999999
+
+	econf \
+		$(use_enable 64bit) \
+		$(use_enable bgp-bins) \
+		$(use_enable bmp-bins) \
+		$(use_enable geoip) \
+		$(use_enable geoipv2) \
+		$(use_enable jansson) \
+		$(use_enable kafka) \
+		$(use_enable l2) \
+		$(use_enable plabel) \
+		$(use_enable mongodb) \
+		$(use_enable mysql) \
+		$(use_enable ndpi) \
+		$(use_enable nflog) \
+		$(use_enable postgres pgsql) \
+		$(use_enable rabbitmq) \
+		$(use_enable sqlite sqlite3) \
+		$(use_enable st-bins) \
+		$(use_enable traffic-bins) \
+		$(use_enable zmq) \
+		--disable-debug
+}
+
+src_install() {
+	default
+
+	for dirname in examples sql telemetry; do
+		docinto ${dirname}
+		dodoc -r ${dirname}/*
+	done
+
+	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
+	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
+
+	insinto /etc/pmacctd
+	newins examples/pmacctd-imt.conf.example pmacctd.conf
+}
diff --git a/net-analyzer/pmacct/pmacct-999999.ebuild b/net-analyzer/pmacct/pmacct-999999.ebuild
new file mode 100644
index 000000000000..36566e6c719e
--- /dev/null
+++ b/net-analyzer/pmacct/pmacct-999999.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic git-r3 toolchain-funcs
+
+DESCRIPTION="A network tool to gather IP traffic information"
+HOMEPAGE="http://www.pmacct.net/"
+EGIT_REPO_URI="https://github.com/pmacct/pmacct/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="
+	64bit +bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mongodb mysql
+	ndpi nflog plabel postgres rabbitmq sqlite +st-bins +traffic-bins zmq
+"
+REQUIRED_USE="
+	?? ( geoip geoipv2 )
+	kafka? ( jansson )
+	rabbitmq? ( jansson )
+"
+
+RDEPEND="
+	net-libs/libpcap
+	geoip? ( dev-libs/geoip )
+	geoipv2? ( dev-libs/libmaxminddb )
+	jansson? ( dev-libs/jansson )
+	kafka? ( dev-libs/librdkafka )
+	mongodb? (
+		>=dev-libs/mongo-c-driver-0.8.1-r1
+		<dev-libs/mongo-c-driver-0.98
+	)
+	mysql? ( dev-db/mysql-connector-c:0= )
+	ndpi? ( >=net-libs/nDPI-2.4:= )
+	nflog? ( net-libs/libnetfilter_log )
+	postgres? ( dev-db/postgresql:* )
+	rabbitmq? ( net-libs/rabbitmq-c )
+	sqlite? ( =dev-db/sqlite-3* )
+	zmq? ( >=net-libs/zeromq-4.2.0:= )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.3-nDPI-3.0.patch
+)
+
+DOCS=(
+	CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE
+	docs/INTERNALS docs/PLUGINS docs/SIGNALS
+)
+
+src_prepare() {
+	default
+	sed -i -e 's|-Werror||g' configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC AR RANLIB
+	append-cppflags -DMYSQL_SERVER_VERSION=99999999
+
+	econf \
+		$(use_enable 64bit) \
+		$(use_enable bgp-bins) \
+		$(use_enable bmp-bins) \
+		$(use_enable geoip) \
+		$(use_enable geoipv2) \
+		$(use_enable jansson) \
+		$(use_enable kafka) \
+		$(use_enable l2) \
+		$(use_enable plabel) \
+		$(use_enable mongodb) \
+		$(use_enable mysql) \
+		$(use_enable ndpi) \
+		$(use_enable nflog) \
+		$(use_enable postgres pgsql) \
+		$(use_enable rabbitmq) \
+		$(use_enable sqlite sqlite3) \
+		$(use_enable st-bins) \
+		$(use_enable traffic-bins) \
+		$(use_enable zmq) \
+		--disable-debug
+}
+
+src_install() {
+	default
+
+	for dirname in examples sql telemetry; do
+		docinto ${dirname}
+		dodoc -r ${dirname}/*
+	done
+
+	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
+	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
+
+	insinto /etc/pmacctd
+	newins examples/pmacctd-imt.conf.example pmacctd.conf
+}
diff --git a/net-analyzer/portmon/Manifest b/net-analyzer/portmon/Manifest
index 58052dc722aa..201ac828806a 100644
--- a/net-analyzer/portmon/Manifest
+++ b/net-analyzer/portmon/Manifest
@@ -1,4 +1,4 @@
 AUX portmon.init 633 BLAKE2B 1989ff9f35abaf8f5e4ea2b86bec3d7c4a708d70571554518077f3b327f2cac2be7e98a1bb5838169cb6f0b45d351160c9ea31acee96458bfb19aaea7ca8f0de SHA512 7bd26de7d5031c79afd3c2a04ca6f4e95af994c552973c89951a39d49a22b2856d02f7d9eef885fc26fb59a0f7063799230fb161682047debe70764565228eda
 DIST portmon-2.0.tar.gz 107246 BLAKE2B 0f3d33aecca7d41a5af08c656bdb9665c9560aaee78dab7b02bf330d21ddde3fcc916a06b7b48ea1ae305b5188e62073065a8c745fd31310415b47ce3b29a733 SHA512 1feafd1a8701d269c2f2e36f46ef51eeda8975aeca85d6f720cf5805e3f8bd031eb681117fa9414e775ea46c543066deb3532e7cc7d26c655daf6163fac77e25
-EBUILD portmon-2.0.ebuild 580 BLAKE2B 51994ec06c8479f812df06bb33e3a63644a3bdb689c6a06b67681fd24dca0b65196bd575d9ecf0f07889270eedba46e9a6c0066f2da8d6cff84581e092b7a074 SHA512 356bb6b49eec3708f2cf2c5ab062cff9d52d7e7d8574bac8cb9a14200b8921495a7679dab388f54ae615068fe6525b8b15d12a92fdb5a9ae74ff60ec73794fdb
+EBUILD portmon-2.0.ebuild 604 BLAKE2B 933852fb1cccea6f20727bc3d4e064739e78c30a0937ddf628fd3d47f90060cb3c2c4d04af5835360613cf9c302fab486b6c6a9d544539bc458d69b7b09dcd3b SHA512 1508fd4b918f0ffe6ea7ff88d82339060fab39776ea18f47239dff8da0f8a2fb5307ad5400e1f84578606bac80211fa9d1db89a500e87b6d4cd686a7bc8a8a21
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/portmon/portmon-2.0.ebuild b/net-analyzer/portmon/portmon-2.0.ebuild
index eb5b845910b8..c413b752a878 100644
--- a/net-analyzer/portmon/portmon-2.0.ebuild
+++ b/net-analyzer/portmon/portmon-2.0.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 DESCRIPTION="Portmon is a network service monitoring daemon"
 HOMEPAGE="http://aboleo.net/software/portmon/"
-SRC_URI="${HOMEPAGE}downloads/${P}.tar.gz"
+SRC_URI="http://aboleo.net/software/portmon/downloads/${P}.tar.gz"
 
 KEYWORDS="~amd64 ~ppc x86"
 SLOT="0"
diff --git a/net-analyzer/prelude-correlator/Manifest b/net-analyzer/prelude-correlator/Manifest
index b1a68c675d31..93c2e983255d 100644
--- a/net-analyzer/prelude-correlator/Manifest
+++ b/net-analyzer/prelude-correlator/Manifest
@@ -3,11 +3,11 @@ AUX prelude-correlator.initd 654 BLAKE2B 10bb6e1ba38c916394cbeab1d314e39ee61753c
 AUX prelude-correlator.run 139 BLAKE2B 2eac955ca980c1e49d39946d3890c5dba1b7f5a40670c28f788d66535e1a52735fb8620a78a1ec6cdb59ae517d0317c363c72779087fcfbdc7011e3b1bdd9370 SHA512 f05c771f387b2eb59e37006ba5bb959d8d67cbdbdfdd5a7c5a42b592d2c9d4532bfa425565722745ad52e7fb1d327738c02f1602e0eeb42ea403275d69380f51
 AUX prelude-correlator.service 339 BLAKE2B 25275e92b5471521e1f8e3f23d1a0a483c7cb3300edbcc563cb84c280f64a7555b47e4cbe97c00ee76777e9f44de9bbd911de69deec5bec2898a09c1a206f7a1 SHA512 8f0d0478bea87e2bdc8266044e580f983b12dcaafec1b7cb87074f9cd3825a9c0b2b6d59fba8fc4a62a5af0b9f0dede6f8c5d3cbf436fcf900b031947ea20f68
 DIST prelude-correlator-3.0.1.tar.gz 181019 BLAKE2B 9156b7c76ac641326dcbb6e89f336ad1a65ed9c0af3b32acaa2d4430d3ba0b5015b5baf6372bdeb8e08d269b7742304f84ac026c512b63ca8710cc757697d0c6 SHA512 2aa159251cf7f9fead117737f67cc01e7cb2012c4fd9db77454c7d639cf477888d5ea6476661bf501c2da7aaef58ea7101b7780669f025af1480acd9480ce8d3
-DIST prelude-correlator-3.1.0.tar.gz 185812 BLAKE2B 8390059cf00f1f4038d31eff401d4a2e475f9ef89fe84b4748c891ccf521fa6c6d241e4e441d6398a2acaf2bf01451e4407188e95779f8c0dbb19713c405cc6d SHA512 f44d805445c19af1f80f2662b7c5d2678e9928fd5cea17e1938a712157ca3ac51eaf361bd164ec6fa38836461b3719cf739232c130f3c784cf692e1588256d79
 DIST prelude-correlator-4.0.0.tar.gz 347973 BLAKE2B 93f383d5d3ca3632f841b8523efa829f00ee36e4fdce76c982ef638f468dc574fa69452b4e9e5abcdaec87697a4a824faf543f0383756d15a72e99c0ac02cabe SHA512 aeeb5d1e29a464afa41b8a04f5324e0915b8450eceea68a07cb6d8bb61823ab8da8df51e1a331f5a66fd295bd2a514f484da5c396e0508c4fc5634c98382779b
 DIST prelude-correlator-4.1.1.tar.gz 237036 BLAKE2B f3965b179d101450bd5b64805d0c982cc093de47fbbc4b4e0077f231cffcf152f3ace78cab5e96d7e18d8af0fae7de0fb5c70c17b8888245558ab091bee6438d SHA512 ac6eb554ab8d20325afbe49fcec9e238d84579cb68ee5731e6ec7d1da11c1b745e60117fade76d8747c93f57d4ae91461fd6e82160f659f88a0bb545e4990597
+DIST prelude-correlator-5.1.0.tar.gz 242620 BLAKE2B 70d4c4cc620fe4aa605812a83979b097e78ea97c5684d0d7ac8f0de2975f68d54f712f0d6dcd341f2928c846663fdf5182f8481fe6142de7648ba8fd2443d369 SHA512 db3a4cb1c4a8254270f63552ee2a959bc28cec8fdb48340f1c301fa65df73115292060067bed4b5945da4717a216313aa6eb2525bc02de4a6a45716b9827f5fd
 EBUILD prelude-correlator-3.0.1-r1.ebuild 723 BLAKE2B 7eadb37a0f6316a87acd061ea90011fdf5158b2d1e0dd025eaa8b07426959af0fe55a57dc76bac474eaa1a43fadf4836621a60f6a708682bcb30ce49f2aca2c5 SHA512 23cfb488a3d604f4bc5351de67c2fedfafc9668c04e81ada545525f0b134ec5765b6555329f8b50fd5ffe7f3f41a79801d556a9faa67b17cd0e4c45604a3c9d1
-EBUILD prelude-correlator-3.1.0.ebuild 730 BLAKE2B 66213e6210c1a2aedeafb7aa964968916e7dae6c98e7fb8c99745146487d898f90c5e94bbd1f0ef56cc707d015e47427538341cb980dd9350c81bdd8608cc9ee SHA512 f79772b4efec8ed3cd4f1023dc6e9661b5669233321393e807519bf28f792491488bf44562114b3cbd98a7c5fbd4b1b0131818dc592908e3dcf7fa2c665bb00f
-EBUILD prelude-correlator-4.0.0.ebuild 754 BLAKE2B 04dac021defd6cc3da1cc62549ee7e229927bcb09c54124c6c339b9ea887566d2602e9780e8cb829a7888b2c04ecf55440673a1133f8422906a8c08d846c7d74 SHA512 7c1ef815f8206e750f20edd8e27da666cb21418dacb9a0b4dc355f99167d9fdd21c6aeaff50a781398a973c8655bd73a2da4eeb6706079f59e5cfc3345681033
-EBUILD prelude-correlator-4.1.1.ebuild 812 BLAKE2B d31e2cdd7c14be30c85866a7071d1662c7404a5b557e53a2bec69631f9864f5f12ead69c357a324152ed5513d40322370abb697e497bc18e6f5c669f65fb3da4 SHA512 aa941e0d397872477d3ca6d03c4773019dbf7b908cf7cb89ae2986955656b2f49c28ba918ab5ebeb1080f7fb87c398db7988507061986dd81cc73abbb9e1c812
+EBUILD prelude-correlator-4.0.0.ebuild 750 BLAKE2B 9b56784560d7d8878a4a7628d72e38e602a0cf9cd59a577c5fc97cd0d27277013e91bd31b4c25a39951a32b44f2736ac0c09973e5d4ca376a2152b12f51b6ba7 SHA512 ea44d448216ab4f47686d734454efbcf922f05a855d80ea95797fc4a4804d7961bc4e00c1f8e16fd15d4e21c97c74b38ea7e0e4c9b28b4f18048c66f4d793f1a
+EBUILD prelude-correlator-4.1.1.ebuild 808 BLAKE2B 8b176bde732306db2357376cc3e11f0f3f3b00a66103f1c089fbe6cffe911e9dab158ed9240f04425b72f5abc1bf4383af4fd36c4d1e1ec76d6278168d974eb2 SHA512 6676802aa703fd738470fb5d1182a357f3fe530ef4fb78bc8ded7f09160ba6a03064b707b76aaa321de8b78817c539c4e0b38bc73fe3a5338ebd4801a9d25ed6
+EBUILD prelude-correlator-5.1.0.ebuild 749 BLAKE2B bab459f78c726959988daa71cf2125b01a0e074cfedcfb96a5638def4efc88b95c773f7e22ea9e7755439ebdf7f3bbb3dcc367c1d6daa314149a8cfee72b8646 SHA512 c0242da96d1337bccf3154399405b68965570496dde459ad74f950825c3517a508838fa9aae268434559795d8c6c4370989ceb28a821f15146fd01ac472e0a3b
 MISC metadata.xml 824 BLAKE2B c17f62271dea0b8f93fdc83b0ccf67545ea24c5bd3f71d782832bc9c8588bdd98b513ed3f6bc5c307aebb3bc3be76e7e8311e38438234779d5da6f248383fb15 SHA512 3b0db2aace5a45f8994622063ca9fb32a06bcb385b63fb013c191606f07e9bb03c1354549b07ac4c17d74a9f25db44be7ea45fc34d6332079209cc56f5262209
diff --git a/net-analyzer/prelude-correlator/prelude-correlator-4.0.0.ebuild b/net-analyzer/prelude-correlator/prelude-correlator-4.0.0.ebuild
index 8be97f154722..d7861468dbf9 100644
--- a/net-analyzer/prelude-correlator/prelude-correlator-4.0.0.ebuild
+++ b/net-analyzer/prelude-correlator/prelude-correlator-4.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1 systemd
 
diff --git a/net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild b/net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild
index 86ce56c4df97..2bcda4ece273 100644
--- a/net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild
+++ b/net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1 systemd
 
diff --git a/net-analyzer/prelude-correlator/prelude-correlator-3.1.0.ebuild b/net-analyzer/prelude-correlator/prelude-correlator-5.1.0.ebuild
index e36ee8a7ccf8..43aef1343542 100644
--- a/net-analyzer/prelude-correlator/prelude-correlator-3.1.0.ebuild
+++ b/net-analyzer/prelude-correlator/prelude-correlator-5.1.0.ebuild
@@ -1,24 +1,23 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7} )
 
-inherit systemd distutils-r1
+inherit distutils-r1 systemd
 
 DESCRIPTION="Real time correlator of events received by Prelude Manager"
 HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
+SRC_URI="https://www.prelude-siem.org/pkg/src/5.1.0/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="dev-python/setuptools"
-
-RDEPEND="dev-python/netaddr[${PYTHON_USEDEP}]
-	~dev-libs/libprelude-${PV}[python,${PYTHON_USEDEP}]"
+RDEPEND=">=dev-libs/libprelude-5.1.0[python,${PYTHON_USEDEP}]
+	<dev-libs/libprelude-6[python,${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]"
 
 src_install() {
 	distutils-r1_src_install
diff --git a/net-analyzer/prelude-lml-rules/Manifest b/net-analyzer/prelude-lml-rules/Manifest
index 95ececc9d51f..52afb1975cc7 100644
--- a/net-analyzer/prelude-lml-rules/Manifest
+++ b/net-analyzer/prelude-lml-rules/Manifest
@@ -1,9 +1,9 @@
 DIST prelude-lml-rules-3.0.1.tar.gz 117551 BLAKE2B 65b4c5a03adf0cad2063463526165a3789ecffd15c75131acbbce6510e354e9e5ddb1575cc682b235e6833a16872889ce67c1557bbe19557e7f154b219c68b00 SHA512 fc3b35fcb6249b40e5f5fad6b22b238167f7039a48a3e7732110a77f23fd82d0f0150a891f83e07ab7e0ccd8b33cbcff5d8498f6f14f01248d87b8f37e6ea9a3
-DIST prelude-lml-rules-3.1.0.tar.gz 117010 BLAKE2B 0ec6c3a02dcc013368ba7793c8ad3446991099b7ae9224b7ee7daa210acd31c7933eb5e0b4098b7a4a870ca9a85937d8642074e09cb9e870efb11bfbf06881a9 SHA512 8addb0ac785098d49aa220e63e95805290028f42504df868660f8ccd5f516c9a7f53e794714fe395c8a50935e64575cd405a20f65dd02692c5613c9bc9a028b7
 DIST prelude-lml-rules-4.0.0.tar.gz 115058 BLAKE2B 93f3bc14f14a8aea70850b67a427f74818bd8119e7f54c66c3391a2e81656dd13462362a6e82d03997701cc8d8189b744922545c7e7463df79b0052e2449c302 SHA512 9244d7d5e4a7a64c10adc2f8bc0662e7ada2a367b6bf6b38292db3abab484bcb0bf3a26696576ecbb593a82de5e372ae3d381070af06a65ba03b01b9273a19f3
 DIST prelude-lml-rules-4.1.0.tar.gz 116148 BLAKE2B 0b24d5673a186f085935cd146dc27d38224736141ec480564e5be0bea7f6d624084e5bd2178453950a5ce57caf1b8ff6e3574d789b230ec07268559801856528 SHA512 a4752bb16a0b7d24f2a5d1ee62390d646778509e63dbdefa2419caca6d6251c429f18abf38dce7729cf185b9a3ef819de3fa75324e36787b984800a76c8dd3f7
+DIST prelude-lml-rules-5.1.0.tar.gz 117585 BLAKE2B 0df09a472cd5bd3306927e788b0fc5451d95bf200ec83f77cede2653c1e28da1c777b4bc6ed1232bbf82c06557bc77ece18c02843349c14a8e0bf453db5191d9 SHA512 ef31b7933a441efa43a994170d3cec377b211b55ee80abbbff7986474d58a1f7b780c717a6c364c9ae162d3a8830004a7dd5c43b5cd8df0e2d92a38ad312eadc
 EBUILD prelude-lml-rules-3.0.1.ebuild 485 BLAKE2B 4386ff4b8f8ff7034e601e8e2ad8efb381cd5398f2acc645bb35a99edfada906b6e2de89a9962c453021d7d3a2af62dec5b81795aff4a5c597ad3b66d95dde12 SHA512 69939ca37558057b4c3b2dbce32e755e834235acfbf9ce11b7570bf049d6cd5f8270264284c60904211bf61ccddce1f4c5b84812c43add186a9b64fdb2a860a1
-EBUILD prelude-lml-rules-3.1.0.ebuild 492 BLAKE2B 2c9758156f5793d7924aa5df076f811658a40b61ca03871208317794587e179751cc66b495df14493450e432f76003e01485b9735a6c78b8d6fddbbbf1d49c84 SHA512 3bab272f739243b2b4af96ab9227562bc58d2d4d36a723f4e31a876b7e48c7a7d0633f4e542b0511df6b8cad70baa3b6306536a36d18214b7d0d0541f740d655
 EBUILD prelude-lml-rules-4.0.0.ebuild 456 BLAKE2B 9defe3181c15de9e839092b35afc63d8e5a2b62dd2341f15d20b8c50825cfb3a5eb1ea49d6997a6c658e9c88098b7ae67ba43afead0f0a6e5cfafc4bf388a305 SHA512 78766de94e82be4044997cefef9434f5d3b72c2b69833e4516002f0170bac933eb469c1d65c8cf700e36bfb9a6d2afb55d2e61df8d41b798e6002ec12e2ce67d
 EBUILD prelude-lml-rules-4.1.0.ebuild 456 BLAKE2B 8973181a90812fe583f17cfbdf2c294f4f5437edc0376e1ce89d9ec037565c290082970f4c5cfc451b442ca6ec977f4ca5f1002ae1b3ad3b599fb6a6642c81c1 SHA512 094855a812d3f0e55cffd72d3e33a512d674d9e268d93af11c6466334877884868d56ed5db3e3b57b98449fd47f6dfa903f43e0ae728192513f762dbcee98109
+EBUILD prelude-lml-rules-5.1.0.ebuild 454 BLAKE2B 67c1020d0d4180704a80cd78e93ce0b313bae0df77b66e152a0cef1f8de9a6c93fe0505c278dbe583548da257a00d525fbc416f4ab8438cc6ea4e165c7b98bad SHA512 785dd110759a98e7b1679922ff6cc14fac51e3ddd7deda145efe5d591648d6db10aa86ce1e3a0722e9b3ba111fdfc2f9c9129a002bf3fec86e187e338e2f2580
 MISC metadata.xml 476 BLAKE2B ff36dabaf589375064e572c154dc5725109905c5ce43e20b4c47ffdbb857a24c9a6e89f8cc3f2dc8977458e8207e52bc77a5354f901b3b6c2298c515f030e811 SHA512 67d80e0bc56afd5694c392259e8ca7488b9595cfd2a2c79479344398513511549b4fa1acab280a67b5d1295bff1a73f2a0a8f5e36980a0087d00a67d2d43d410
diff --git a/net-analyzer/prelude-lml-rules/prelude-lml-rules-3.1.0.ebuild b/net-analyzer/prelude-lml-rules/prelude-lml-rules-5.1.0.ebuild
index 892e695f5e20..31c1829ee02f 100644
--- a/net-analyzer/prelude-lml-rules/prelude-lml-rules-3.1.0.ebuild
+++ b/net-analyzer/prelude-lml-rules/prelude-lml-rules-5.1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Prelude LML community ruleset"
 HOMEPAGE="https://www.prelude-siem.org"
@@ -11,12 +11,11 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="~net-analyzer/prelude-lml-${PV}"
+RDEPEND="~net-analyzer/prelude-lml-${PV}"
 
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 
 src_install() {
-	dodir "/etc/prelude-lml/ruleset"
 	insinto "/etc/prelude-lml/ruleset"
-	doins "ruleset/"*.rules
+	doins ruleset/*.rules
 }
diff --git a/net-analyzer/prelude-lml/Manifest b/net-analyzer/prelude-lml/Manifest
index c23bcbf671bd..261ab98f7247 100644
--- a/net-analyzer/prelude-lml/Manifest
+++ b/net-analyzer/prelude-lml/Manifest
@@ -6,11 +6,11 @@ AUX prelude-lml.initd 563 BLAKE2B 3a914e5cb52d2f137e6dbbd4a66e8de280ebad362b80e1
 AUX prelude-lml.run 125 BLAKE2B 79cab33e4b7f2508d621cef7342d34042e5841a73c2e75aae447870eb8ca8c7b8acd21e0664753511f7d659eb70d4f5ae80e20dcbed7addefd5d97967265fd3d SHA512 876f3c9c2c005cf146590e3c8718ae4fc04f80594ad2f279f6794e035a8ebed6b6499c6d8ac8268e8c953e615a79743eb24bf992a9857a743f75ca253aab95ad
 AUX prelude-lml.service 297 BLAKE2B c1ecbb3f69c21ccd82f7c985598a3cfcf5313d9004d9bc1b9f7dc911b54a51ae1aa0870c5fe236ef1473254196aec34391b838d928bb3c0d1e7ee92f131abcd5 SHA512 0faa91b3736fe111b08fdd3f03829c35a81133cfc54e677ebc423d4d9a29113744253fbee12f9b531494f2f39b549df54eec4cc5c7363375443113277fead87a
 DIST prelude-lml-3.0.0.tar.gz 1391203 BLAKE2B b3e4bfab596f869919c70dd7d2c3860bba33754970eff9b1a8c238f35cafec67601548985bd36244740062455a19fc816cbd7eb50bc6a3c4c97cf9da5b288dd3 SHA512 f206407f99df394186466566608b434a94d4fdce3e5e8991a4236f2ee670f6ae2573adea22bc248fdfea760588e94160faa7260257aeaeb35c938e1bb886ee6c
-DIST prelude-lml-3.1.0.tar.gz 1408600 BLAKE2B 7475754de5df1200e89fe37fbdc27ec7d0862f7d844ad56adf6875fea88c19e3a7f4da725a729bde16171e207ce47f40200eaf10ddeededf0b14ac60fd92cf4a SHA512 16fe23c410f6ee585513589c1f9435e0a7dded010ccfd8bb0a8744603e7e020378afee474f6146472afa39263052defddc8c9115235dbd3015727c18f625773b
 DIST prelude-lml-4.0.0.tar.gz 1435446 BLAKE2B 03231bfe4763bfbbc3256075f832a99f83c8e26221412f6b07ab7464d4d46b6abdad6dccdd3379927dbf05cfe808b31df57398f48bd794a311ced19f6e7fac67 SHA512 e2ae3a754f722b19110a32ae9ab7d0d9ce5ceb256c04a2b56f6549802d605cfa741cef4687c8883b585a0dd59f3507ee2d1275f4eb05050d10d24ad068522ef8
 DIST prelude-lml-4.1.0.tar.gz 1457294 BLAKE2B ec57e0e1d9048918c838965444888e80ee320882057dd3972c5da68402ca2443363dc26efc86e89916b1bc4e25d32c36aeac350ddf4aafb4598e8b3704e4f6e7 SHA512 e34d542e3b9e12873f9e2a19e2573b32e2b686574cbc8678cefbb198d7397695f8a2512effb58be9e6703663158c2294d741e0f6f8db23c5541e58bdd3c7f035
+DIST prelude-lml-5.1.0.tar.gz 1585080 BLAKE2B 572a3bf2b013dc3f427f7e3a4cc650219945a0e481e10f9f8f8e6afac75c86db5319fd16f1bf9157ede55ae511ce5151a0fe63694d0b8cc2becbd6430521fba3 SHA512 248434352c340d9979051897190fc7fbe835c7b1f2411ec98a04cbf0bebb6f115e80ca854d35ab2b2f50722c052eea10e088e4557ca4218f0dfed21ae21109ae
 EBUILD prelude-lml-3.0.0.ebuild 1109 BLAKE2B 4f2be6c6d6bd55d6a6d3f9bd906f1f44d2807cae707ff250104889ba158eef110ee8d05fd1f81bcd85b5e467b30bfbbb54bc27402d1913bfbc0a8e93450ceea9 SHA512 aa73cbe3ef1c8da02224fb03ea7a8f43f1eaf41563bb922428cae527a83378db76a8ead23b5247cc2c0688f47ed32a6c966967f7d9729ea5b9e3505492afae14
-EBUILD prelude-lml-3.1.0.ebuild 967 BLAKE2B 71a06b5af5d23ea93e164ad4046d92c8225f5c96ad435205a217bcbd8f239d775082e8947f60ea6abb4229eeaef0097be502e9b221c7092629e5e03972785f3b SHA512 43e1ce24d1a1929b6848cb1cc66d9d2fad451b9c952a2e816cc4266f2d52c411cb0d892696c7fc6abf8e4da654cf633a0f3aae4ca7713eccc1102746a3bade73
 EBUILD prelude-lml-4.0.0.ebuild 974 BLAKE2B 1d458ff6c476e56b22a0e510c9dbd831d6ee88e6647d9a040b6270507aa7a86779a85c825a029d3333122ac5909b3329817a98e284d7ca9cbeaaa2d53c5557d2 SHA512 c5b5b976364e17a1cd34a7b260b75891a75d8211a808e34551134e6e5419bf004865ea26589ccaed712aaabc31e42e27fdac3c68c61a4068ad46ac4efe7641a2
 EBUILD prelude-lml-4.1.0.ebuild 1045 BLAKE2B d5538ff12b7a81d4828d9f36c89987836f8697228779cae58fb86261b16796792b9ac711680bf82cd6cf6a2f7c71ce2ae9db9e9a2010fccddbdd5cff7ec79ba1 SHA512 b69be9c14f0587bc2bcfd85ea8c23f8f06f49704bcf373c2fee5921402ada7694fb57aa06357277ddace4b1528db05732cd85e4c8063a03b4900c76625412004
+EBUILD prelude-lml-5.1.0.ebuild 1075 BLAKE2B fec34ee3090b221fd4736640b74aa46c7b7c8b91c0ad994b3be21e5b03fa340dea49ab4429a7fd0486de97f92670136c2b6a3c73b61a628c55ee6aa78ab1d4f7 SHA512 e53ead9beb5a4dd2ed4d15288773dbe958c14ea4c3506c26bf988958a220c7ca81e680ad7655afa80a82c9dfb6a9728ab15bbf81faa9e143edd2b7cb2b3dae6a
 MISC metadata.xml 859 BLAKE2B 029350529cf91a38bba7ebf303271c5388e7407266a1808a410aa05d004d68b01fe48470384cfa45bf671d6ea095b14ee6f9b462b94cee4b30c1198485626e68 SHA512 8a5d558c9a92c34f3a9eb082c2295422cf834c158bf295cdb2c85f6bde1c242d6e350299ef53b8a6556eb736c1ea7cb825723354a370b419a338021b8ca6e724
diff --git a/net-analyzer/prelude-lml/prelude-lml-3.1.0.ebuild b/net-analyzer/prelude-lml/prelude-lml-5.1.0.ebuild
index 97d2cf351889..2d2d40b4db58 100644
--- a/net-analyzer/prelude-lml/prelude-lml-3.1.0.ebuild
+++ b/net-analyzer/prelude-lml/prelude-lml-5.1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools systemd
 
@@ -12,18 +12,21 @@ SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ssl icu"
+IUSE="icu ssl"
 
-RDEPEND="~dev-libs/libprelude-${PV}
-	dev-libs/libpcre
-	icu? ( dev-libs/icu )
+RDEPEND="dev-libs/libpcre
+	>=dev-libs/libprelude-5.1.0
+	<dev-libs/libprelude-6
+	icu? ( dev-libs/icu:= )
 	ssl? ( net-libs/gnutls:= )"
 
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/${P}-run.patch"
+	"${FILESDIR}/${PN}-3.1.0-run.patch"
+	"${FILESDIR}/${PN}-3.0.0-conf.patch"
 )
 
 src_prepare() {
@@ -33,15 +36,18 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}/var" \
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
 		$(use_with ssl libgnutls-prefix)
+	)
+
+	econf "${myconf[@]}"
 }
 
 src_install() {
 	default
 
-	rm -rv "${ED%/}/run" || die "rm failed"
+	rm -rv "${ED}/run" || die "rm failed"
 	keepdir /var/${PN}
 
 	find "${D}" -name '*.la' -delete || die
diff --git a/net-analyzer/pypacker/Manifest b/net-analyzer/pypacker/Manifest
index 1fa1a8b06acd..5b1e66ec2fc0 100644
--- a/net-analyzer/pypacker/Manifest
+++ b/net-analyzer/pypacker/Manifest
@@ -3,9 +3,9 @@ DIST pypacker-4.6.tar.gz 592362 BLAKE2B 41fc63f1fc40ab1cfc007db9dfc6d18cedb51cc8
 DIST pypacker-4.7.tar.gz 595975 BLAKE2B 95f29bf88347df5c4673a225049337c053cc4833a13767a3fce700a911fb7b744a61ea745f3d3ac4a14cc93288504e190c9cda228000b8a41b924b23805efcf3 SHA512 9c874af28887e942f62a7f540961f7e31af3b35e52f960ec99ed53e6a5ea29d36f20a6dbcf652125ac6b72849502a30e5d11ee1f795c90c7efd5702a0d34b2b3
 DIST pypacker-4.8.tar.gz 600508 BLAKE2B e9cdf07ed7d92aecad24e2bea9d18f67eca4477bccc273d77b82701f3110b7b71db5f35bc29ee45d33ac8ba02e8c8d1d36b31e326f21a443f6fc2b2375678330 SHA512 729a55e745f645b874bc6a868afcff543a26aae74b5241204c8e7103f754c296204c43b9db5b64b4a3423f735e2c658e9f0d97f7c84f0f8b134b29c5a2e55227
 DIST pypacker-4.9.tar.gz 602068 BLAKE2B 1ddc16e361ba0aa57b4dab62c38c37aabeffe2cab5cb819e627aeaac5452201117c2f806f2f443cad96d673f93bf0f0a159fa6a7d59564879d038524a2de1eb1 SHA512 804bb32eda76a00121c88d38722a6fb51a9fcff0a5625bd46bda68329e39139624c4fb8e2736208733a6b97ec0df02f173d304fcf3bb39549f3fa119fcf0ae2f
-EBUILD pypacker-2.9.ebuild 696 BLAKE2B 3ec2822ab28c7ab75e6a2cd049ad397a4ef86c54f60d06f87c8d544e911a0d513651211dc4020f267e864db782188f3c4e31d749e58a1656427ad68b3b1ff67d SHA512 7fc02ab96434a780d5e6f51e8ccd6f5c2fbbe8227e4f41ba93f85f0894d805f028a6cc3e8321a9455079335698f558a796944c6a7be37ceb40413d4b6098350b
-EBUILD pypacker-4.6.ebuild 719 BLAKE2B 9eed77684be21fa11c6f836495d3e98c4d6fb22f93d131ee0d8ba81aa00f48de6888c4138ee7f2fa2e77d28a054ab281333a607d7b604d1db47f3b9125fc4f12 SHA512 5c006fb5efb4a1ebc90cbfc488e9484ed102a2168c4d7d4889b9e55c92eafb0a29976943cf83474c12815581b90d95373e7cb14fb35a831153b9d3461b71c9fb
-EBUILD pypacker-4.7.ebuild 720 BLAKE2B 91e167ce37ebd0ef552ebdf06580a3d36abc15bd56b2357db7af954834f44aaaeed6b8a5f08d6295c744b40f5247321cc4686e4c844849427e3c5beb6efe1fe9 SHA512 a0e2aa316203e0cfdc138911a0b3be4bf8c23494750ec4c64638ada7d41d4e1f671944883c9683c553c06e28172e3d6cd37419b169ba844cb420691e6c56b59a
-EBUILD pypacker-4.8.ebuild 719 BLAKE2B d6d000b5d81c6652f5b6c1f82d2c608d19888fb8006d3317ee80cd85f62927055c22c490287d097352085e83c66ec7708220bce21fa08033e5d24a6bfda28939 SHA512 08b6737b554194e95cafc22f1dc1affa3fd48595d755059c69e459f6ec3b203e7e50a1b113b8adef5584f87a45943dc19abe07a3f3cdb94d031fd0420b291df1
-EBUILD pypacker-4.9.ebuild 719 BLAKE2B d6d000b5d81c6652f5b6c1f82d2c608d19888fb8006d3317ee80cd85f62927055c22c490287d097352085e83c66ec7708220bce21fa08033e5d24a6bfda28939 SHA512 08b6737b554194e95cafc22f1dc1affa3fd48595d755059c69e459f6ec3b203e7e50a1b113b8adef5584f87a45943dc19abe07a3f3cdb94d031fd0420b291df1
+EBUILD pypacker-2.9.ebuild 692 BLAKE2B 94ccc3bbd9680ccac4915dc1b15ddd76b07e073ad1eae7cdb2595e4b20d9a505c8e9c8bfd95b2198709e5be1ed884a4903186d123309aab246710cc0af9b3863 SHA512 05d53594e94db18550fc0a53fa78b93d83ee0487a9335b45f2cc4bde175ffd63a70c9b119a1f2629e350cdd7300aad88d1eb1e2a6ea6f7622965c5a9aabe265b
+EBUILD pypacker-4.6.ebuild 715 BLAKE2B a2c48e14a11d229fe0b1add3d6360979b8553df559a85e917705576690d7dd435f166ad92e5f18d90015d92a1970c5c7d6a4ba05227dcb2fb7b36501bc4d434b SHA512 29a072a6e8cf693eb6f5851fb69c08fcf5e091f74b642ebb448b50c7fd4f04273ddcef3430d3ed2335b35315fc184ee3c1e1df474b26e7278bc7919d70c18daf
+EBUILD pypacker-4.7.ebuild 718 BLAKE2B 0ee2fc094e17d53359489d455313732830bed4c28adac28d4417d25ad9ef526e564b8f8488231aa3bbfdda0a70f834d9a5bdd06b3a71b01d52b84ff8e4ff93af SHA512 6a177c503f19cc1ef957ed78e68b966b5621902506e5db425f321e0bd04e3b9447bca54265cfb8a6b079b69ac592824a13b0e50013a4cc22c026d90abfe55f7f
+EBUILD pypacker-4.8.ebuild 717 BLAKE2B f9d0d1c7e932fd641a3b6b4919ee7766e44d77208d7ae4712a68d66ac402dd808d4717b462cd6cad3d6ba9a4b7b9e071dc12127ecf1a0e31430cde837d6535b6 SHA512 84747d635c68cd479b36ca30b884926b8ced9dedf2b85511ee16b37b1e03aca888ed7c93c24f4d60786717f85485dafcbac6cb7ccf6be23b67cc57133297b6dc
+EBUILD pypacker-4.9.ebuild 717 BLAKE2B f9d0d1c7e932fd641a3b6b4919ee7766e44d77208d7ae4712a68d66ac402dd808d4717b462cd6cad3d6ba9a4b7b9e071dc12127ecf1a0e31430cde837d6535b6 SHA512 84747d635c68cd479b36ca30b884926b8ced9dedf2b85511ee16b37b1e03aca888ed7c93c24f4d60786717f85485dafcbac6cb7ccf6be23b67cc57133297b6dc
 MISC metadata.xml 471 BLAKE2B 16f24ca5a8c373e40115c441da2b6efabca5ebf7f6cd5d4e55c64320172d92470e34c484c7c9d63dce8f4fcf1aff0a0adc0d0743807cd342756aabfe790b4356 SHA512 8eda90dced7132f754ceccf39fbd1b7fdce0ff01490987eb6c6258544dcac27ba03313cb401396e0014c0fff42133da53698681ad5ac48d0f29bead5786abe2f
diff --git a/net-analyzer/pypacker/pypacker-2.9.ebuild b/net-analyzer/pypacker/pypacker-2.9.ebuild
index dabd1067842f..67f90fa81e25 100644
--- a/net-analyzer/pypacker/pypacker-2.9.ebuild
+++ b/net-analyzer/pypacker/pypacker-2.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/net-analyzer/pypacker/pypacker-4.6.ebuild b/net-analyzer/pypacker/pypacker-4.6.ebuild
index 0f4a660d8dff..4b7d4924659f 100644
--- a/net-analyzer/pypacker/pypacker-4.6.ebuild
+++ b/net-analyzer/pypacker/pypacker-4.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/net-analyzer/pypacker/pypacker-4.7.ebuild b/net-analyzer/pypacker/pypacker-4.7.ebuild
index 1e65889800c5..50dc293e909b 100644
--- a/net-analyzer/pypacker/pypacker-4.7.ebuild
+++ b/net-analyzer/pypacker/pypacker-4.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 vcs-snapshot
 
 DESCRIPTION="Fast and simple packet creation and parsing library for Python"
diff --git a/net-analyzer/pypacker/pypacker-4.8.ebuild b/net-analyzer/pypacker/pypacker-4.8.ebuild
index db80e87c9202..f10389269bce 100644
--- a/net-analyzer/pypacker/pypacker-4.8.ebuild
+++ b/net-analyzer/pypacker/pypacker-4.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 vcs-snapshot
 
 DESCRIPTION="Fast and simple packet creation and parsing library for Python"
diff --git a/net-analyzer/pypacker/pypacker-4.9.ebuild b/net-analyzer/pypacker/pypacker-4.9.ebuild
index db80e87c9202..f10389269bce 100644
--- a/net-analyzer/pypacker/pypacker-4.9.ebuild
+++ b/net-analyzer/pypacker/pypacker-4.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 vcs-snapshot
 
 DESCRIPTION="Fast and simple packet creation and parsing library for Python"
diff --git a/net-analyzer/python-gvm/Manifest b/net-analyzer/python-gvm/Manifest
new file mode 100644
index 000000000000..fbae40786b1c
--- /dev/null
+++ b/net-analyzer/python-gvm/Manifest
@@ -0,0 +1,3 @@
+DIST python-gvm-1.1.0.tar.gz 160289 BLAKE2B 64dbf79f6749c50cddc2b908c45c6aea6c3793f0ddb10a98a96870636ee351f1a2e66227fbcc1383c63e0e015b4c05bf4c116ac80ef35f73f7e9057f9c8dd9b5 SHA512 dae04d42a14adde274c2148f7bd4b47b0ea02d6e249d6c23dfeb15f217f04ad9ff722f2e98d13e1a7add7b61d9dabfec623ab5b45087aaf5f480447fd31a8071
+EBUILD python-gvm-1.1.0.ebuild 825 BLAKE2B 27fa0bc179da27573a4bacb5e8acd8ca7f55132c5ab1fead87afe52cde97c280e2e2e7fc9c8948ea82c6cdb14ca84858c2833100994cbaa023f28a723137ce13 SHA512 e15f846d2e2c9b30ebf4528dbe5fbf6f0b3b16ea71842c1c4d0979fa9e5f3872d519c6f4be683a6c75326b8f7ddfbcd0a6c386fed3f8c5dba93582cafaa4e786
+MISC metadata.xml 887 BLAKE2B 2027f57f28286aa9a7cd3d258dd8af4790b5bd0a852d0c40f48ded6986b129583f7043b36974d7708eb95d258160d7ea22ff3d468caef949f759e83f13bef77b SHA512 f04cfc43ed1f0efda4134830afdf4e6c6a54edcd3c880de49a9888b4093a3ddb0d898ab38f5d68f8bed4dd34810659ece1ad3074beeff742606a37139131a7c6
diff --git a/net-analyzer/python-gvm/metadata.xml b/net-analyzer/python-gvm/metadata.xml
new file mode 100644
index 000000000000..92109f9a1354
--- /dev/null
+++ b/net-analyzer/python-gvm/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hasan.calisir@psauxit.com</email>
+		<name>Hasan ÇALIŞIR</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+	The Greenbone Vulnerability Management Python API library (python-gvm) is a collection of 
+	APIs that help with remote controlling a Greenbone Security Manager (GSM) appliance and its 
+	underlying Greenbone Vulnerability Manager (GVM). The library essentially abstracts accessing 
+	the communication protocols Greenbone Management Protocol (GMP) and Open Scanner Protocol (OSP).
+	</longdescription>
+	<upstream>
+		<remote-id type="github">greenbone/python-gvm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/python-gvm/python-gvm-1.1.0.ebuild b/net-analyzer/python-gvm/python-gvm-1.1.0.ebuild
new file mode 100644
index 000000000000..9a52388287f5
--- /dev/null
+++ b/net-analyzer/python-gvm/python-gvm-1.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Greenbone Vulnerability Management Python Library"
+HOMEPAGE="https://www.greenbone.net/en/"
+SRC_URI="https://github.com/greenbone/python-gvm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/paramiko[${PYTHON_USEDEP}]"
+
+DEPEND="
+	${RDEPEND}"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	distutils-r1_python_prepare_all
+	# Exlude tests & docs to fix build issue
+	sed \
+		-e "s/packages=find_packages(exclude=.*/packages=find_packages(exclude=['tests*', 'docs']),/g" \
+		-i "$S"/setup.py || die
+}
diff --git a/net-analyzer/ripe-atlas-tools/Manifest b/net-analyzer/ripe-atlas-tools/Manifest
index 7560f76207e4..19fc6240d997 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 1325 BLAKE2B cafa4231fc6ca592b9610a08dd8f020b4ba9383d4eb23a63d4b35eca1a6bd2309e176f01781190a41279f599d85f841087a9888c9477704f0962e9683ac7b66c SHA512 cb908a0a5be8f3df758fff19d4e8338149ea8cf56f20b2744a57d2f6007d866b410ce96ba7521dc3f79feaa5d6434d69564fb60403716aeae931283e2b6a2cc7
+EBUILD ripe-atlas-tools-1.2.3-r1.ebuild 1321 BLAKE2B 5167fd2e1c7527a4b098311f7d5674186b5d4f489206d2ff1e82622ac82f51b94259011188f1f5c90daedb2a1b73d939a4025f3a82834eebd3762a33acbb398d SHA512 0a2dc507a9efcf02cde69690d4e788d8f528b325df13bd787cabb3923342159a069a25a8a17f3129ee608ed42ab51b1abe5f98125fac7366c66ee6fcd6178254
 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 dbb861877c8b..fe1fedc35fa3 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
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index c0cd26a33e24..1496c28d0a76 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -12,7 +12,7 @@ AUX rrdtool-1.7.1-rrdcached.socket.patch 733 BLAKE2B a9ca7691e1589061e65ed4acd3d
 DIST rrdtool-1.6.0.tar.gz 2186538 BLAKE2B b56ef79b9d45a65cacd7c1d8da2158dcaaff3ebc2ffc0640081cdc2fa3ac643be1ce48a2cac60427a836dc3e457ddb042c95533d0ffbcdefa2978f5659150391 SHA512 45a8f16a2bda9d497c5f39de80236adb7a5bd054a14755c4d130f21cd6430bd0a76caef9632994be56fd1ea2364eb218687ea8ebf945a71ca411221c248f3ebd
 DIST rrdtool-1.7.1.tar.gz 2881346 BLAKE2B e538c6ba3fb6726f0515ed655aa8d5e184f6d3066bb32e981b3254e41c53e29529698da5ef73f8365391180c76d15808d1d727a0834b8025893b01c3b9af8f46 SHA512 ee5c9ff234493442ccd9bfc7031700483011de3e05c01e026509b699cb0d7d3e286e2046357c5fff5807f3e709043c8f218b48b43f8b126a23e228a3927d7b14
 DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29
-EBUILD rrdtool-1.6.0-r1.ebuild 4238 BLAKE2B d4f47ed88190e565c9b78d781ea7af7aa44a5d50f5d5c3b8e4b6dd089415f44f23ad3bc99920e0484cd316557f5950d42a85c1bfd035e3ddf0fb9d92a48bcea1 SHA512 c50b37aed115f3b8acdaf5b46c880e48b206705e598594e1c15999c4e2b2885cb52a6a98c7ce695981e3410c46813e7e9d07295bebeab9006130b8c5b2eea65d
-EBUILD rrdtool-1.7.1.ebuild 4245 BLAKE2B 3908c6f33b0f229cdc31fa5960f216ceccbb97138f5affefc98c2a5c578b2e4453dba37d7a0c97801ca2e81dc4f2d49140deffc5a6e2d1f67fba35c3aa14545d SHA512 f562122b7d42d804acd869882eb06289b5943fe3daf6f85eeeb84027292659b4ac1bbe527f8e2df3850a94503375f632a33dce88c1f3f128d5b47ea353d58b90
-EBUILD rrdtool-1.7.2.ebuild 4193 BLAKE2B f4884f5057fa865abf852dc1022b05d3bbc8678d441458a97417481c7c699289b2dae618c3653962e777ba273a359f712e6f425b6a2e6f99c46162befbf8ffd2 SHA512 d3745480835b470ac3956649eae82c3eda1131ef81fb007696522bf92110f8e124536305ed95765a667d85fe6056df35f553725623e8e652c16099dbda287cc1
+EBUILD rrdtool-1.6.0-r1.ebuild 4258 BLAKE2B 4e6effe766e867419f463459767d592c9a8c80457be70442a1c96aaf6a4c3ce41111708d834b5e9a02d47f10cb3eac5dc0701937e42c47c36b8f399ace6f7968 SHA512 7d2080aee08d9ee99858001a69d983b4359362f91ac810183bc5621cec9bc615395c44f8a67f1009f058c1d366c06a99eb2c604a67667715d82f6a9af81aa104
+EBUILD rrdtool-1.7.1.ebuild 4261 BLAKE2B 6afa7adff86c88ad084bacd0c6ac1fbb4a5cfd394a39e7cabea028db06fed7cfd5994e882e6e0bcd0fa35292beae3cfa25de5cd94640b3e990d0b5f4c1056141 SHA512 43f62d0fef4a571bf7464d555c8dcf6e7e87080f9e9fd704a5c08c4187c6de2d96ee0538410d974ee977e066dba541f12c8b7ca382db3de2132b88b57edc12c5
+EBUILD rrdtool-1.7.2.ebuild 4209 BLAKE2B 02442e375f23612dabe41b9fe2334de9953e1dd1e47f39a25b044be24c81baeb47021b6a47a251c2ee4398d57e9bd1166ef2cf5d72bcf5fae48405a8dca24dcb SHA512 5e3c5b7a5ea126dd5f8a09b9847dcd5dbd4443a3f6240b0d8ce72971938cc257160284de12115e4448e969ba8a256e76689274bda08ae17a521a81d8729e362f
 MISC metadata.xml 486 BLAKE2B d4e04c193a7b46a532791a0a448c7db4acaa4b4d4d775db70b6ab843ba32b616c91b516dbaca5b4e0a30649743553325a134291edb0ee17fe2ca049ed1e720ff SHA512 ddca3904aa3e0f1d2f543ae9329298a2dc69bbc0803c568d0871bb5ace21d2dee4d0b226e5eef0258fd59dd2cf046ee807afaa588e31db35e574f3d707894a23
diff --git a/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild
index c781e4a95684..a8b6b2a7e51f 100644
--- a/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild
@@ -13,7 +13,7 @@ MY_P=${P/_/-}
 
 DESCRIPTION="A system to store and display time-series data"
 HOMEPAGE="https://oss.oetiker.ch/rrdtool/"
-SRC_URI="${HOMEPAGE}pub/${MY_P}.tar.gz"
+SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/8.0.0"
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild
index b1ac8232ccf9..ff22873538e5 100644
--- a/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.7.1.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
@@ -6,14 +6,14 @@ EAPI=6
 DISTUTILS_OPTIONAL=true
 DISTUTILS_SINGLE_IMPL=true
 GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit autotools perl-module distutils-r1 flag-o-matic multilib
 
 MY_P=${P/_/-}
 
 DESCRIPTION="A system to store and display time-series data"
 HOMEPAGE="https://oss.oetiker.ch/rrdtool/"
-SRC_URI="${HOMEPAGE}pub/${MY_P}.tar.gz"
+SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/8.0.0"
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
index c0583310fe34..858ec12f8290 100644
--- a/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 DISTUTILS_OPTIONAL=true
 DISTUTILS_SINGLE_IMPL=true
 GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit autotools perl-module distutils-r1 flag-o-matic multilib
 
 MY_P=${P/_/-}
 
 DESCRIPTION="A system to store and display time-series data"
 HOMEPAGE="https://oss.oetiker.ch/rrdtool/"
-SRC_URI="${HOMEPAGE}pub/${MY_P}.tar.gz"
+SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/8.0.0"
diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
index f44dfb0a481b..2c7a90cb94ff 100644
--- a/net-analyzer/sarg/Manifest
+++ b/net-analyzer/sarg/Manifest
@@ -2,7 +2,13 @@ AUX sarg-2.3.10-config.patch 2612 BLAKE2B 8d0d6bdab60784dd9c289e974dba087b11234b
 AUX sarg-2.3.11-Werror.patch 1012 BLAKE2B f3e9b66c95fe905817c2ceecc52e863c4c0eb9c09d96a525c7876a5f807160421f694b95a02f8f1d62e1292102218c6a1fecf3ed1dedd8f0c7b6b9293322c034 SHA512 e74013c3bc22248ba08656b8751ca6177aeb070ce06661279ee3208ffa62dac8014fed0d6e35b65627ce6f02e70ed662b41dccf21dae8ff2b4e5902cc141e358
 AUX sarg-2.3.11-configure.patch 641 BLAKE2B 8afacc3e90ee7092b762c812dd7e2cab94e9bc6d63026818fb67b26c814b101695989d31e2b3bdd61a346334008afbe2b6f55493e68ecf5c55f7e23f16325253 SHA512 15dce8406ddcc4a4937743c9a6ee8cbe11eb95ef2d86f56f8e6a7b5f3288534a98cb0b3609332ef6b40a3d5d22dc879aaa750f0bbda64b3d5ecc66c606bad9d4
 AUX sarg-2.3.11-format.patch 778 BLAKE2B c3fdcbba47da9ef4b27adeb3cd0bcfc80b1eee230bfb7f44ed5508e0ebe0e5005abf9c40b8794f6986a533170166f7d5c455e0782271f9f87c5db7da594460e9 SHA512 d7e6baa56465d163c0422dd15317bbbf2bf8b20e4aae54eab2c77c7505f18cbf1cc600ddf35ed3f8e7b2a4c58326c5e38c837711c8f9d9188a1e1e8dfe244bc7
+AUX sarg-2.4.0-config.patch 2417 BLAKE2B 7c5f0ddea35dd77acf38431f17427c5be7d4880bcaa230c3570a5d39f8910943f94df9f6f257ba4185add2cad8795ed481371ebaa259de5b60937a569fc732d5 SHA512 8b3ee4d986a200a9ba47435bb21b08c860a7af3543f7ba88064e63b89b0dde7da40d397c57789e411c1a2be55082e8832882236ba45ecc71821df0ea8618e623
+AUX sarg-2.4.0-configure.patch 1497 BLAKE2B 2cd26287e2a5b3cbd641ead5953fb499c542ac3d1c149149261bafbc51c8bbed454dbdecfe2009d54e3ed9c7532de136396e71b8353e55cf9c98638f1157438e SHA512 c6031d8c0034dea88fc83b3171cd0d221e6a421c7806b0af3cb3a80e2c73dc92e273793f7420e4f30490911bbcc13368c0fa1cd328b972ff3eb63ae7b652cf0c
+AUX sarg-2.4.0-fabs.patch 245 BLAKE2B be45ebf17fe6d7588fa7bd8d94da305347f7f017b61875ffc3249ac1a2788ddbee7e09fc855328e0da961866375b43f5a25c2421462b95fcb8265653c3fd2803 SHA512 9fd403ea0ddc411b99645f27e4b0209d9609355735601aa225621fce74270ebaae0e5569ae111bfba88fbd97cb41099f6eaf14047d09f2ceaac25dd85b6b134b
+AUX sarg-2.4.0-format.patch 400 BLAKE2B 020927621edfb7512f962fb12d0536b6a9a471c784b11f4105a27b533ec609cd9be3d97a43e45a2b2f45342a633ee300f6e39274ffb3aa48a556c44c95a49260 SHA512 fa6f3c0eaf0950c03d5cd8561e0e51cb06b008a90ae4df322933b56e92b73873f4903e3caf6adc7bbe886e2b7d3a53355637c5fa334b7d55b271384876d93c86
 DIST sarg-2.3.11.tar.gz 1346884 BLAKE2B f1ba5e5d3531b611cca1e18444b24772d5f6fb31622d3702ce34bf7e5208b7ff04000ed80c984ff103f785dd9b7015f56403b8389100bbd02cdbf936c8343be9 SHA512 a5bf5c0f696a9d58d9dd1d631d2b458e7a48f597e7a084b032b2feb6185440b08babe7ffaaefc04676f0dbc11301084d1896b6246a7e79a10acdbd7aa7882ff6
+DIST sarg-2.4.0-pre3.tar.gz 1364547 BLAKE2B 94729294de60ded125abd346d38833c64b3f0b320b0e07fc8153e287ce84b09ff83259fe2189afa087a46e6617d47628c162e3bda209563e3f7618d71ffd0cd5 SHA512 136313e36a8107f1ba84f7653aa3a0972beea05b89d77d8bd02a564c62881696f87bd2ed6cd0069624fe2ed013042cd604932220c8476d62702d27e68e8fd655
 EBUILD sarg-2.3.11-r1.ebuild 849 BLAKE2B dadaef09ee5131c4aec4bec7a5d27084a9a5da0bcb0bc18f7648ece30d5ff7b8da5345bbc3833c423c3530c2596cdebb837396aacccd2f11471e26a53d78b448 SHA512 395e8bbb6c7b752637393f6ad1b90b964cc7502f3750674888a1ae94da13de0efa890c52f5dd59af0e23f54a4976180859cab86aa3b9ce0dc62bdbe74c0b3973
 EBUILD sarg-2.3.11-r2.ebuild 900 BLAKE2B ae2ee2cec4f73a97a4f2191a2a5659ab2cb314bd6e17b886085c246cc8aec0ac699f22aece2c3516380d107191b8267a211d496372a7ef5005776d32369134f4 SHA512 1905afac5cb561d9f28f11e86a4f594ab01a2667bbb84ac2504a916f43710a4c3547a8213094da9d70727ee6d14d2dea61ec6e2ea78f600a1486cf82ba9a7dfe
-MISC metadata.xml 856 BLAKE2B 0640133457b9035a7a30e4ec481ff092254902a21cb8f8cc9a91d0a0b13f99a484982787646e2367f7bcde5f3d2436371f588729acc35b638c289c09cddb2ff9 SHA512 3571bb6b4562fa58e9736ce48c4b3930bb33a3b38dec15b79b22b3cbd457ea7751819a2b45a7e728b02e641c187c085e813eb29d8644dc57e40b682f061b115a
+EBUILD sarg-2.4.0_pre3.ebuild 1217 BLAKE2B 298dbdce30c542511a51f16b1f3b345cfb5035e2c9cad2c39e127a010068d934488d8a83eefaf7297c8a172705671bacdad0d13eda8b724e177fd2d53a35c237 SHA512 c38ab11a82e2c2488215326c26f34d91b0f6027fbb3c2c0b298ba89746933d3ae8b0d6a66b88a38e8eaae1e42b64382a72a6f59a688a2ddeb07c1e97a2e5d1d3
+MISC metadata.xml 997 BLAKE2B b0103361ea70e01da884621e5243317afdae68481b50c18296122617b0bc29669d50d6c6dda00c85d77e48186111bdf9252419a1b0627993b91dc652b263ca32 SHA512 0b24013475c4e92553539de23c2e88dff9e0bf9c42b3c5d6cb46e54dc113ceb8bc5889ac1d1c397f73bfde600ec6a394b2ba0da2520351f9050ec873b2c8d49c
diff --git a/net-analyzer/sarg/files/sarg-2.4.0-config.patch b/net-analyzer/sarg/files/sarg-2.4.0-config.patch
new file mode 100644
index 000000000000..1168f98337d7
--- /dev/null
+++ b/net-analyzer/sarg/files/sarg-2.4.0-config.patch
@@ -0,0 +1,81 @@
+--- a/log.c
++++ b/log.c
+@@ -151,7 +151,7 @@
+ 	strcpy(FontSize,"9px");
+ 	strcpy(TempDir,"/tmp");
+ 	TempDirPath[0] = '\0';
+-	strcpy(OutputDir,"/var/www/html/squid-reports");
++	strcpy(OutputDir,"/var/www/localhost/htdocs/squid-reports");
+ 	AnonymousOutputFiles=false;
+ 	Ip2Name=false;
+ 	DateFormat='u';
+--- a/htaccess
++++ b/htaccess
+@@ -1,4 +1,4 @@
+-AuthUserFile /usr/local/sarg/passwd
++AuthUserFile /etc/sarg/passwd
+ AuthName "SARG, Squid Analysis Report Generator"
+ AuthType Basic
+ <Limit GET POST>
+--- a/sarg.conf
++++ b/sarg.conf
+@@ -17,7 +17,7 @@
+ #       If some files are passed on the command line with "sarg -l file" or
+ #       "sarg file", the files listed here are ignored.
+ #
+-#access_log /usr/local/squid/var/logs/access.log
++#access_log /var/log/squid/access.log
+ 
+ # TAG: graphs yes|no
+ #	Use graphics where is possible.
+@@ -147,7 +147,7 @@
+ #       The reports will be saved in that directory
+ #       sarg -o dir
+ #
+-#output_dir /var/www/html/squid-reports
++#output_dir /var/www/localhost/htdocs/squid-reports
+ 
+ # TAG:  anonymous_output_files yes/no
+ #       Use anonymous file and directory names in the report. If it is set to
+@@ -632,7 +632,7 @@
+ #      Generate reports from SquidGuard logs.
+ #      Use 'none' to disable.
+ #      You can use sarg -L filename to use an alternate squidGuard log.
+-#      squidguard_conf /usr/local/squidGuard/squidGuard.conf
++#      squidguard_conf /etc/squidGuard/squidGuard.conf
+ #
+ #squidguard_conf none
+ 
+--- a/user_limit_block
++++ b/user_limit_block
+@@ -24,8 +24,8 @@
+ #
+ #
+ 
+-conf="/usr/local/sarg/sarg.conf"
+-squid_password_file="/usr/local/squid/etc/passwd"
++conf="/etc/sarg/sarg.conf"
++squid_password_file="/etc/squid/passwd"
+ tmp="/tmp/sarg_limit.$$"
+ 
+ limit_file=`grep "per_user_limit" $conf|grep -v "#"|awk '{print $2}'`
+--- a/sarg-php/config.php.inc
++++ b/sarg-php/config.php.inc
+@@ -1,13 +1,13 @@
+ <?php
+ 
+ // Change to squidGuard and sarg config file paths
+-$SargConf = "/usr/local/sarg/sarg.conf";
+-$squidGuardConf = "/usr/local/squidGuard/squidGuard.conf";
++$SargConf = "/etc/sarg/sarg.conf";
++$squidGuardConf = "/etc/squidGuard/squidGuard.conf";
+ 
+ // File where URL to block will be appended
+-$DefaultSquidBlock = "/usr/local/squid/etc/block.txt";
++$DefaultSquidBlock = "/etc/squid/etc/block.txt";
+ 
+ // Choose the locale you want to use to display messages (it must exist on your system)
+-$language = "fr_BE.utf-8";
++$language = "POSIX";
+ 
+ ?>
diff --git a/net-analyzer/sarg/files/sarg-2.4.0-configure.patch b/net-analyzer/sarg/files/sarg-2.4.0-configure.patch
new file mode 100644
index 000000000000..7ca44a6901f1
--- /dev/null
+++ b/net-analyzer/sarg/files/sarg-2.4.0-configure.patch
@@ -0,0 +1,43 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -35,6 +35,11 @@
+ dnl C99 support is required to define LLONG_MAX (at least on CentOS 5.7)
+ AC_PROG_CC_C99
+ 
++dnl mkdir_p / MKDIR_P
++AC_PROG_MKDIR_P
++mkdir_p="$MKDIR_P"
++AC_SUBST(mkdir_p)
++
+ # Report more warnings to improve code quality.
+ CFLAGS="${CFLAGS} -Wall"
+ 
+@@ -50,23 +55,23 @@
+ # Don't compare signs as it is a mess
+ CFLAGS="${CFLAGS} -Wno-sign-compare"
+ 
+-AC_MSG_CHECKING([for implicit-function-declaration error flag in $CC])
++AC_MSG_CHECKING([for implicit-function-declaration warning flag in $CC])
+ saved_CFLAGS="${CFLAGS}"
+-CFLAGS="${CFLAGS} -Werror=implicit-function-declaration"
++CFLAGS="${CFLAGS} -Wimplicit-function-declaration"
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_implicit_function_declaration="yes"],[have_implicit_function_declaration="no"])
+ AC_MSG_RESULT($have_implicit_function_declaration)
+ AS_IF([test "$have_implicit_function_declaration" = "no"],[CFLAGS="${saved_CFLAGS}"])
+ 
+-AC_MSG_CHECKING([for format error flag in $CC])
++AC_MSG_CHECKING([for format warning flag in $CC])
+ saved_CFLAGS="${CFLAGS}"
+-CFLAGS="${CFLAGS} -Werror=format"
++CFLAGS="${CFLAGS} -Wformat"
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_error_format="yes"],[have_error_format="no"])
+ AC_MSG_RESULT($have_error_format)
+ AS_IF([test "$have_error_format" = "no"],[CFLAGS="${saved_CFLAGS}"])
+ 
+ case "$host" in
+    *-solaris*)
+-   LDFLAGS="${LDFLAGS} -lsocket -lnsl"
++   LIBS="${LIBS} -lsocket -lnsl"
+    CFLAGS="-DSOLARIS ${CFLAGS}"
+    ;;
+ esac
diff --git a/net-analyzer/sarg/files/sarg-2.4.0-fabs.patch b/net-analyzer/sarg/files/sarg-2.4.0-fabs.patch
new file mode 100644
index 000000000000..e9b73d88fb4a
--- /dev/null
+++ b/net-analyzer/sarg/files/sarg-2.4.0-fabs.patch
@@ -0,0 +1,11 @@
+--- a/btree_cache.c
++++ b/btree_cache.c
+@@ -268,7 +268,7 @@
+ static struct bt *get_disbalanced_node(struct bt *node)
+ {
+ 	struct bt *rdn;
+-	if (fabs(node->balanceinfo) > 1)
++	if (abs(node->balanceinfo) > 1)
+ 		return node;
+ 	if (node->left)
+ 	{
diff --git a/net-analyzer/sarg/files/sarg-2.4.0-format.patch b/net-analyzer/sarg/files/sarg-2.4.0-format.patch
new file mode 100644
index 000000000000..686f659c1300
--- /dev/null
+++ b/net-analyzer/sarg/files/sarg-2.4.0-format.patch
@@ -0,0 +1,22 @@
+--- a/userinfo.c
++++ b/userinfo.c
+@@ -78,7 +78,7 @@
+ 	int skip;
+ 	int flen;
+ 	int count, clen;
+-	char cstr[9];
++	char cstr[10];
+ 	char filename[MAX_USER_FNAME_LEN];
+ 
+ 	if (!UserStrings) {
+--- a/index.c
++++ b/index.c
+@@ -535,7 +535,7 @@
+ 	struct dirent *direntp;
+ 	char yearindex[MAXLEN];
+ 	char yeardir[MAXLEN];
+-	char yearnum[10];
++	char yearnum[15];
+ 	int yearsort[150];
+ 	int nyears;
+ 	int year;
diff --git a/net-analyzer/sarg/metadata.xml b/net-analyzer/sarg/metadata.xml
index deaa23376cb0..774ea9db6563 100644
--- a/net-analyzer/sarg/metadata.xml
+++ b/net-analyzer/sarg/metadata.xml
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>netmon@gentoo.org</email>
-    <name>Gentoo network monitoring and analysis project</name>
-  </maintainer>
-  <longdescription>Sarg - Squid Analysis Report Generator is a tool that allow
- you to view "where" your users are going to on the Internet. Sarg provides many
- informations about Squid users activities: times, bytes, sites, etc...
- </longdescription>
-  <use>
-    <flag name="pcre">Enable support for regular expressions in the hostalias file through <pkg>dev-libs/libpcre</pkg></flag>
-    <flag name="gd">Enable support for graphs in reports through <pkg>media-libs/gd</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">sarg</remote-id>
-  </upstream>
+<maintainer type="project">
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<longdescription>Squid Analysis Report Generator is a tool that allow you to view where your users are going to on the Internet. Sarg provides many informations about Squid users activities: times, bytes, sites, etc...</longdescription>
+<use>
+<flag name="doublecheck">Make sarg double check the data it manipulates and output a warning if an error is found</flag>
+<flag name="gd">Enable support for graphs in reports through <pkg>media-libs/gd</pkg></flag>
+<flag name="glob">Disable to ignore wildcards in file names</flag>
+<flag name="pcre">Enable support for regular expressions in the hostalias file through <pkg>dev-libs/libpcre</pkg></flag>
+</use>
+<upstream>
+<remote-id type="sourceforge">sarg</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/sarg/sarg-2.4.0_pre3.ebuild b/net-analyzer/sarg/sarg-2.4.0_pre3.ebuild
new file mode 100644
index 000000000000..992488f78a3c
--- /dev/null
+++ b/net-analyzer/sarg/sarg-2.4.0_pre3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Squid Analysis Report Generator"
+HOMEPAGE="https://sourceforge.net/projects/sarg/"
+SRC_URI="mirror://sourceforge/${PN}/${P/_/-}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+IUSE="bzip2 doublecheck +gd +glob ldap lzma pcre zlib"
+
+RDEPEND="
+	bzip2? ( app-arch/bzip2 )
+	gd? ( media-libs/gd[png,truetype] )
+	ldap? ( net-nds/openldap )
+	lzma? ( app-arch/xz-utils )
+	pcre? ( dev-libs/libpcre )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="
+	${RDEPEND}
+"
+DOCS=( BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.0-config.patch
+	"${FILESDIR}"/${PN}-2.4.0-configure.patch
+	"${FILESDIR}"/${PN}-2.4.0-fabs.patch
+	"${FILESDIR}"/${PN}-2.4.0-format.patch
+)
+S=${WORKDIR}/${P/_/-}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable doublecheck) \
+		$(use_with bzip2 bzlib) \
+		$(use_with gd) \
+		$(use_with glob) \
+		$(use_with ldap) \
+		$(use_with lzma liblzma) \
+		$(use_with pcre) \
+		$(use_with zlib) \
+		--sysconfdir="${EPREFIX}/etc/sarg/"
+}
+
+src_install() {
+	default
+
+	dodoc documentation/*
+}
diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
index 65238e453d01..8a46ee9a5f8f 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -2,7 +2,7 @@ DIST scapy-2.3.2.tar.gz 1166056 BLAKE2B bce5f37bd833dc457089cdfebd2dc019c4f7bed6
 DIST scapy-2.4.2.tar.gz 3330071 BLAKE2B a40074594cd561b33d04364fba743fa5fe741b06b2ad8f8f9ebe9dfb0b9a3bc4f641cd16d99a4ba070fc0763d7cfeb8d3ecd056f162d509070cdd57d55d6ad9c SHA512 980f708a849ae26edca3eb6618a41668818c5883bca699f347f47a8964b3ee44a6ceefe4a12cb7d5fe6c13f5cbe2b7547938e53139f4ec9e6ef384e30c9bb6db
 DIST scapy-2.4.3.tar.gz 2969754 BLAKE2B 83ab6500dbc0424b728253661f03391d450f77b19c0059b8a605a19f48b4ddd7344743310a5cb7c741fcf750876ba125daf883d04714981ff81ef4db97519ae0 SHA512 579e3f326f90e10b2839aee805949e14ecab9431f360ef75e60080a971653e1f48a240d812b8ace77754b01b07a2ddb8533d1e6b18ee8804280bf9b2c237cede
 EBUILD scapy-2.3.2-r1.ebuild 869 BLAKE2B a1695ad6505bc5367342dfc3ffbd9a5d8e537f3cbdda910e69f617e1a93932d4f2bdd2a7bba2b1d887de7bb7f79a14dca981d12a7c4468683fe3eaae7820a67c SHA512 375c40a3da50a5ba136034c2c3cccba46d61c6ac63ff29c12d0ceeb3e20fece28812b0a1bd22710ec1ec0be62c57263f5744a652052bdd461099f657d63636f5
-EBUILD scapy-2.4.2.ebuild 1015 BLAKE2B 84ed365afa54aca1f499902ebc7a200f3464f9f7e9157fdab17749ce59cf25524e18ae9f7181e09e760d2a02ddd701eeccb5b10371573e33961f0037ebfced13 SHA512 434e19fcee3d9c71b7967440cd8af2dd2cae36f8e26f99e9b02de202fe80116a0e8eb501be8db7ff7d633f6f1bec7202b5b65826a7a21881042f1b9b5f723dc4
-EBUILD scapy-2.4.3.ebuild 1009 BLAKE2B caacdac8cebdf60d50f02589e0cf0232cc0fef9e1f327b1d3143235703fcee0b162b31c2b3c0d2195be2ec42538e8f7ec198331d4d12bf1e31c5cb01fb75969f SHA512 585bb1d4ed1c391ff7727d847c4fd3ed9ab8598ef00898c41f852c9843719f00d1f07bd4d41186dbac472031d501084754bfd26cd307d347c8799f7c065d1a3d
-EBUILD scapy-9999.ebuild 971 BLAKE2B 633a8a0de6c713957cd4d0c775244310fc039057295602ef127e2f899e7f3fca94ffd61d5964ab44cae4bdae19041a99f8b774df17f325ddea8eeebda0f4be07 SHA512 8e367a693eb6d62ffba9e8db226314c0524c258501c024a0dbeb395f4f1fd1ed4a29b2550c6c5e3eb41cfb274309119763f5f1d977849d7fbfe20ec65a2c8908
+EBUILD scapy-2.4.2.ebuild 1013 BLAKE2B 4af428aa0b92bd5c174fc79d8d5a7ef010b220049d5a3db9b9b204235629ad9711c42d57635905be3f3f50965b215f539086d6fc5bf8be047c98075f90158208 SHA512 0655992680d112db6c7dc5b9c88c5effca5cb274eaaa2f6e055a52162b995f28a29a436279900c7bf1cfe21452b8a10fddc76a43d9b7014eddce0e8fcf946a23
+EBUILD scapy-2.4.3.ebuild 1007 BLAKE2B 6edc7972a1bfa098191eebedc09f60b529446c9d3fd52224de76669f5a0c1a2c02c4f7d1580529be28aee9a732ab3050f731bcd5e1fffd072e50099338103f3c SHA512 ce625f9ad780400c15ed27fc32163e5e4b2caa10e681ea8fe4e1c1f28cac4e7e6e0ee9d185ee4cf5048963c4de9ec3d497298a026e02e3fca85a2f6f47dd5796
+EBUILD scapy-9999.ebuild 969 BLAKE2B 7198f47406b105b9868360fa6401cc43dba652b9f4ed8f51db77b260fa5219a46f205272481c7ac6c1df0f114d97aabd655082cb7350a3d1ca5626a0492b2dee SHA512 0eeedf2e36137c56561d783a8b0b592e1e98f374a86a69f2e7f4fb0ad52d1ceec5d0c2b3783f2c53dbf566b1fd13ac0606776b4798c1bfea773d3c7f8ee5e263
 MISC metadata.xml 674 BLAKE2B 9aeb70531e3395462033100fc9b709533c158bf7939aa46930558b48e9f750030bc26f750b574f3e31ee5779c65a7afb48ed74f8db9d738849e9ab97d621f351 SHA512 54bbc8a152f8433e3da143261bc530df95e8a5808791582e2d2115476001f63381219a3738bb80c1833f56d331ee54908cf72f3c72cc27e05100f6de8edc6caf
diff --git a/net-analyzer/scapy/scapy-2.4.2.ebuild b/net-analyzer/scapy/scapy-2.4.2.ebuild
index 121abefbe78e..a9ccc7667e9d 100644
--- a/net-analyzer/scapy/scapy-2.4.2.ebuild
+++ b/net-analyzer/scapy/scapy-2.4.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 inherit distutils-r1 readme.gentoo-r1
 
 DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
diff --git a/net-analyzer/scapy/scapy-2.4.3.ebuild b/net-analyzer/scapy/scapy-2.4.3.ebuild
index ccaf35b48e6c..6d48ba472755 100644
--- a/net-analyzer/scapy/scapy-2.4.3.ebuild
+++ b/net-analyzer/scapy/scapy-2.4.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 readme.gentoo-r1
 
 DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
diff --git a/net-analyzer/scapy/scapy-9999.ebuild b/net-analyzer/scapy/scapy-9999.ebuild
index 955a856de149..0293cc5ace34 100644
--- a/net-analyzer/scapy/scapy-9999.ebuild
+++ b/net-analyzer/scapy/scapy-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 git-r3 readme.gentoo-r1
 
 DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
diff --git a/net-analyzer/sec/Manifest b/net-analyzer/sec/Manifest
index 4d0fb3cf38b1..21e25d1007f0 100644
--- a/net-analyzer/sec/Manifest
+++ b/net-analyzer/sec/Manifest
@@ -4,6 +4,6 @@ DIST sec-2.7.6.tar.gz 121621 BLAKE2B 43dbccd05aa274459ba8746c8aba33bae0307929524
 DIST sec-2.8.1.tar.gz 143700 BLAKE2B 4101883ccd947140546659c799f9641d496912f22e08debbae5bc9b8b65301ddfeb4c005a9885063c6381383d1f0581a7b96f56cf53bf2401438cfa6cf1755f0 SHA512 03c7acd1e1cfd6dc11143e0ff35758925ddc75e460987a91d5606564f0caa45afade497b8653ec2d8865cfcfab4d87743777eb104e1a16f79069cf61e17d0661
 DIST sec-2.8.2.tar.gz 144131 BLAKE2B d2c9e33be815c1e2321e94e2f679ca6eb6d272b4f68bbf575508c916293c39a36bb4e675a09986395fb34dcc04e356a0dcbf88d076f4c27f532337b4493138d9 SHA512 846a0671d5d774f74645e5e4f6d7a01c04079be19ea9b2ec9cb862fb48173dac0e1131981bb6e1fae525c74610dfdabc1535ff5818ae893bec35daab46e05c07
 EBUILD sec-2.7.6-r1.ebuild 586 BLAKE2B e3bde9b861cc02de2581baf734db4010ebbee161112761bec720b29c6c8adf4edec9cb5ebe91f601ea0b7ff1192275de33bb9c39a540b83613dabb56927d49eb SHA512 4034915b115742ecb4af7064d5201b307a130d9f5f0c81d4d4c4107b144bc46de592cc01c391412e6c1e42f457b51d44abda67753f47856cd2ae3ea065b78b6d
-EBUILD sec-2.8.1.ebuild 585 BLAKE2B bd6753b397aebb6bc4f0ac0f173ad17f436a9aa5d2124a62d05efcfdbac5d55a38fd2322a71b29bfbdf055713f07572fa2a0053b5513897d3053112ec433a2c3 SHA512 fe82437d3edf3ad40fc931efee30c32c15cc82ead092e62745100b7fdbdb6c07864c141be72f9d9c3cb1e4c406a8f90105f92bff88d69a26df5c0508315d074a
-EBUILD sec-2.8.2.ebuild 585 BLAKE2B a80472f738f4caa72fa437694bdc78a968704ab92567ce6700e3e72932206df9c8943dee22bd0f06aec080b1e62cd7778905a90b74b5c1b12084cd99dad29e16 SHA512 428a4a6748434f4bb6fcbddd9761134f626a64e3ee5e1fa5c168fcb12e1b79b0f6e65d1ae31dca653f5212e4a0cd0943444752b8f86b539968695ddef6a4db0a
+EBUILD sec-2.8.1.ebuild 610 BLAKE2B 84451d07bc87110195d0b4ee7faa7ed1ce3e5ed954b2e20c534bce54fa8f4476a7b3e7d67f5afe33c5ee5ac23ec9e1d7e0618ebd1f8febb982d45c2a6b759e2e SHA512 a8f39d6cbc3f75da47bd0df7fdfba819809706349c3a8540020951a4bd1694e5ceae686744f2948b2333867a510c934f291c279940d95f537b1d1f3dec364254
+EBUILD sec-2.8.2.ebuild 610 BLAKE2B e46f7a0470b407ee09a8287360f4a81fd8f849253847e8d4a46a50bab326adef0f7edac1a7aad8f26f3461c5c98ea0cdeecb4b1d07379c41984f33b1ea1ac215 SHA512 bdfa73c7674d77a5b2439acc42794fabf89eb814b4ddbd03b83ad3b3e53e1c3bf664aa12f700a39b26c7fa251b6c9e96debdfc74f3aeb754a2d110aee6087b9f
 MISC metadata.xml 420 BLAKE2B 29fa29df871421f64c8830bb568810b3a5247096ddd393276fa1fb0ae6f935f89c60ff4aa98a38ce5f3360d1974e454ab82f86c0a6e92c3f587140abbc0a6326 SHA512 328ae47d44a57623e92e4a03d1877898d18088aeca6998d4d5a827688e8f449337668e83ecb93ba4d74a011f5b19f8862e59ca657246a5e85a6749c19f0c7dab
diff --git a/net-analyzer/sec/sec-2.8.1.ebuild b/net-analyzer/sec/sec-2.8.1.ebuild
index 1cd6cd62871c..2cca6dc0b078 100644
--- a/net-analyzer/sec/sec-2.8.1.ebuild
+++ b/net-analyzer/sec/sec-2.8.1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Simple Event Correlator"
 HOMEPAGE="https://github.com/simple-evcorr/sec"
-SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/simple-evcorr/sec/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/sec/sec-2.8.2.ebuild b/net-analyzer/sec/sec-2.8.2.ebuild
index 52906d7916b4..75aa0134ffbd 100644
--- a/net-analyzer/sec/sec-2.8.2.ebuild
+++ b/net-analyzer/sec/sec-2.8.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Simple Event Correlator"
 HOMEPAGE="https://github.com/simple-evcorr/sec"
-SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/simple-evcorr/sec/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/sguil-client/Manifest b/net-analyzer/sguil-client/Manifest
index 0d335f530677..d99eb4616d91 100644
--- a/net-analyzer/sguil-client/Manifest
+++ b/net-analyzer/sguil-client/Manifest
@@ -3,5 +3,5 @@ DIST sguil-1.0.0.tar.gz 892934 BLAKE2B 69459eed682d91a1b57ba08c141dd655dbbfaa0d9
 DIST sguil-client-0.8.0.tar.gz 216433 BLAKE2B 65403d7c0de38fd4c010129ee692ab4af6853299566e3ffc6ac9a7f4e64b781830dad41f76dcaf4567bf5f217c5bd59396040cf36017b0ecdac733bc02c179db SHA512 44e14273cb7506b89d3138a1c50160de99576e77d6d18e3cdab9f257a1d00d5a100c8d9790f6e93aea8312fab51d52260aedfaa00facf54107249686d93e09b3
 EBUILD sguil-client-0.8.0.ebuild 1146 BLAKE2B a1b0ea60b014ba9e87a7f61b599d2d0d6096c4668e31a2da969155209641b48816cadf1947fe71c408267faea457913ea9ab9f945e52e59ccdab965fd1b6ba22 SHA512 128c4a4f45e7359e0275e8fc33a3984ef1aeab5171015526dcfd34d48d79a8aeb7c0a0e277c032f3a6fea9fec26b54fd9dff08bf539cce9d536bafab78073ba0
 EBUILD sguil-client-0.9.0.ebuild 1102 BLAKE2B fbf995943267883c71ce8d03730fd732da63f11c0ccde412384916c0711d664801b58def85413ac26b3932ffeae0625d20bb7a7bb34ca6c77ce8988740ac97e3 SHA512 0a287f755f98e56312696acfa83e69bf274d2719f539ed36e10d6c4c50a75fff3d7dd610e03ee984bef19a7420d9f02ab0a2671a13d4bc5cfa8bae41bbdd0932
-EBUILD sguil-client-1.0.0.ebuild 1074 BLAKE2B b60039f9764b0e1ff19b3d0b32927ede30e9bdb5ab7eea908487dc40634031ccd66c60fa936ac3bc9e4b25cc9e2d6872eccb67dbc79d142af2da7a63a0e72721 SHA512 30f4728b3e8a7f3884c4ce9bd91eef3fc05ea0ff175cbedd87d6e6914f9fb705d0ba791145a5f76f8df641520e23facc9a13ccde83ec47662bd0c70e01246e55
+EBUILD sguil-client-1.0.0.ebuild 1093 BLAKE2B 042ee076c79780106eb8799056cd7899ff8488397f453c2fd675f9125f5808a943f45852c15821c3b61641fc6e7c02e707de8f1fa0f735ab5259d99945298fe1 SHA512 0e8aa35756d94df4cb9b25d9a4ec44fb6582d2da15f771e6794977b2e46ac0dccdeb370333b85c84204cab2e150d9b90312572892d3799d55045c14f41a1ca5b
 MISC metadata.xml 418 BLAKE2B 7d1502fb438a75e29db9a29cd469c6ded1cb6566e374bd9ec0aa1ba4902b160a6e2f568bbacf78956db116df52e7bf647fc9c1b69a3e38b254c60ebc74fc6ea0 SHA512 bbe71ed5ce17f337808f82d4fe54ef68b94723a808c597a52d049b88b7334be9abb066911accf9175886405f3f02d37d838422a933afe8e00eeeac2c74ba5ed3
diff --git a/net-analyzer/sguil-client/sguil-client-1.0.0.ebuild b/net-analyzer/sguil-client/sguil-client-1.0.0.ebuild
index 7188ff915ed2..ff7063df84c7 100644
--- a/net-analyzer/sguil-client/sguil-client-1.0.0.ebuild
+++ b/net-analyzer/sguil-client/sguil-client-1.0.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PV="${PV/_p/p}"
 DESCRIPTION="GUI Console for sguil Network Security Monitoring"
 HOMEPAGE="https://github.com/bammv/sguil"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P/-client}.tar.gz"
+SRC_URI="https://github.com/bammv/sguil/archive/v${PV}.tar.gz -> ${P/-client}.tar.gz"
 
 LICENSE="QPL"
 SLOT="0"
diff --git a/net-analyzer/sguil-sensor/Manifest b/net-analyzer/sguil-sensor/Manifest
index f23e8ce89968..86c4220b00e9 100644
--- a/net-analyzer/sguil-sensor/Manifest
+++ b/net-analyzer/sguil-sensor/Manifest
@@ -6,5 +6,5 @@ DIST sguil-1.0.0.tar.gz 892934 BLAKE2B 69459eed682d91a1b57ba08c141dd655dbbfaa0d9
 DIST sguil-sensor-0.8.0.tar.gz 142829 BLAKE2B f753c1bf6a95ba7b12d3a91d2d6ddf506b9dfb09208d08ad5ffcea95210525f014c3807d3e79df10739b00466e5e10e88d2e2494cfbbbb7c7145f2800df62600 SHA512 9b90598f2a3fdcf8652ccb92123944ffbda61c00f131bc951b12a95002f84f555f8c63cc1235fd7bb90875d00edbecbda02750bcca3bba7d16e1b1a150eb74ae
 EBUILD sguil-sensor-0.8.0.ebuild 2129 BLAKE2B 398b1e178cccc0814579378a69de2ab129d5f0b8c145e3c778f5a4076ec1ddccece005fdd4dbbe9f7cc2f2365d4e85748fc795238f538b331d3f54a75a271040 SHA512 5f8b73a592c21266b4cab281861f5c4173443a0bb05a91498394f5dc2561776e30152d790710448583555f0ebb91575335811d7a644cbed4c4c59e3e4491a9c9
 EBUILD sguil-sensor-0.9.0.ebuild 2161 BLAKE2B ee8cbc4719f3891f58297d89415609964db35649f3da01d16bde68fd7d918c50b1dddd0d5b5067bd0e4dc32aa930ae46a3e7159268cabb029b82aa2a444812e3 SHA512 8f9934b42fa92264c4eef6c6436b10b4686de6d612e26ee458cf4cba170ce172f66e40dbda3730f74410341a8d95101f6ca396e931bc03fc9abf6fee8c4abccb
-EBUILD sguil-sensor-1.0.0.ebuild 2141 BLAKE2B b74157cee416d6771923b97bb4380b189213a9cb6848ad8fb6ae27871c7079e7edd82bda3573b9611c228469c6895803acf0592cb4e3eeb7d2ac460dbb09fecf SHA512 7c0e48c9356ae779e97f7bbcb58a7327bd994aaa8c09c0ed440a4f7d853129ee691dcb80616b4947bd565623df267759f58ab8289ceb210acaaf61fd9020cc5a
+EBUILD sguil-sensor-1.0.0.ebuild 2160 BLAKE2B 5c182204b5b0f5de7fba446e6babf7b6492114db3d06131673c09138a030ef79b0de8a693805dcb852771a212d9f8e04fc2fef928a5a454584f7bbdad570fbdb SHA512 b01fe1b28e1a1c50bb6f172826ccc594e87958c95e058bb2f2e8329b6d2740e8c3718aaf349276da1222d3d3615d9aa84536cc3bed45727f4cd72f4e8fb92256
 MISC metadata.xml 418 BLAKE2B 7d1502fb438a75e29db9a29cd469c6ded1cb6566e374bd9ec0aa1ba4902b160a6e2f568bbacf78956db116df52e7bf647fc9c1b69a3e38b254c60ebc74fc6ea0 SHA512 bbe71ed5ce17f337808f82d4fe54ef68b94723a808c597a52d049b88b7334be9abb066911accf9175886405f3f02d37d838422a933afe8e00eeeac2c74ba5ed3
diff --git a/net-analyzer/sguil-sensor/sguil-sensor-1.0.0.ebuild b/net-analyzer/sguil-sensor/sguil-sensor-1.0.0.ebuild
index cb9d1ed1994a..31a638ddfc5e 100644
--- a/net-analyzer/sguil-sensor/sguil-sensor-1.0.0.ebuild
+++ b/net-analyzer/sguil-sensor/sguil-sensor-1.0.0.ebuild
@@ -7,7 +7,7 @@ inherit user
 MY_PV="${PV/_p/p}"
 DESCRIPTION="Sensor part of sguil Network Security Monitoring"
 HOMEPAGE="https://github.com/bammv/sguil"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P/-sensor}.tar.gz"
+SRC_URI="https://github.com/bammv/sguil/archive/v${PV}.tar.gz -> ${P/-sensor}.tar.gz"
 
 LICENSE="GPL-2 QPL"
 SLOT="0"
diff --git a/net-analyzer/sguil-server/Manifest b/net-analyzer/sguil-server/Manifest
index d9f5e40efeca..fb7c00c6d04e 100644
--- a/net-analyzer/sguil-server/Manifest
+++ b/net-analyzer/sguil-server/Manifest
@@ -5,5 +5,5 @@ DIST sguil-1.0.0.tar.gz 892934 BLAKE2B 69459eed682d91a1b57ba08c141dd655dbbfaa0d9
 DIST sguil-server-0.8.0.tar.gz 102236 BLAKE2B 15dfe03f79bba92486e12fa85a368e01005c8587abd7119ef5264c14efaf8f8861346c1744590316a2a40160d11b3042abe8456f911fee677d83846561a8ee70 SHA512 84161365579e3b4227314d9f61afad6ad220261525d7fc8016210a13ee607815eb33178bab026f8a217c43a42f2e623c41d579c5898f58207a18e31685426710
 EBUILD sguil-server-0.8.0.ebuild 2716 BLAKE2B 194464c08905549da414376bdff269f777f3836555cff3ee4a379e2498d5dc6a41bc42ece6bc73bccc1200051c2e7447f615c079b19142ec2dcc7fd3fcd06701 SHA512 69c4956fcec20c7813150fdcbb75f2df7ccc5b7691944967e03a88d63678e27d9d3179fd93a217e24880a5591e072891d0ad81931c7a847e04671d2c6a75383c
 EBUILD sguil-server-0.9.0.ebuild 2744 BLAKE2B e7edb0c386675f3a9a216d4728b238a322414533a2547b059611ace37aec043f2fc22b8aec4fa3d293d2e6fcb97d5eb6713abb761087d0452a1fec3ecf204af2 SHA512 bae037820841e967a714d7b054a2830fb8dcc369729fce90132286b07abc7fa09fcb777c667a0b8a69a1182a584962dce47d0a7323f89a5a4762e06ec588e931
-EBUILD sguil-server-1.0.0.ebuild 2674 BLAKE2B ec252a002fe56e3040749eb08292c225d2d8218a55b271dc54106ef6925d054d1b20363a14e997acd9e106b53fb1fcdf1b62e6b3baf835cd885849b0f029e477 SHA512 927006d9ddfd4f9fcb71601c87579974d662e5b6f0679646f553ce54bfd1137e214754da9cf6bf9b8afbabcf41941bf92d5df684af327d68f0766458899f941f
+EBUILD sguil-server-1.0.0.ebuild 2693 BLAKE2B 0c92be7b28a87f61dbdd0ed94795b47b53e38c55617f1ec1412b6654522c441d77375225c04981cb750413a586ede3ac67ba7dd608e6ec649eb3d9df18ac6f09 SHA512 9c98836ed5b69503dd896a4d55d877e89ff8972fec6001c7d84f554affc948702adaabb7ee945d55b83deb5318526ef8634fd04f5667d26037c4c479fe4dcae5
 MISC metadata.xml 418 BLAKE2B 7d1502fb438a75e29db9a29cd469c6ded1cb6566e374bd9ec0aa1ba4902b160a6e2f568bbacf78956db116df52e7bf647fc9c1b69a3e38b254c60ebc74fc6ea0 SHA512 bbe71ed5ce17f337808f82d4fe54ef68b94723a808c597a52d049b88b7334be9abb066911accf9175886405f3f02d37d838422a933afe8e00eeeac2c74ba5ed3
diff --git a/net-analyzer/sguil-server/sguil-server-1.0.0.ebuild b/net-analyzer/sguil-server/sguil-server-1.0.0.ebuild
index 82b621af6cde..3504273d30ed 100644
--- a/net-analyzer/sguil-server/sguil-server-1.0.0.ebuild
+++ b/net-analyzer/sguil-server/sguil-server-1.0.0.ebuild
@@ -7,7 +7,7 @@ inherit ssl-cert user
 MY_PV="${PV/_p/p}"
 DESCRIPTION="Daemon for Sguil Network Security Monitoring"
 HOMEPAGE="https://github.com/bammv/sguil"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P/-server}.tar.gz"
+SRC_URI="https://github.com/bammv/sguil/archive/v${PV}.tar.gz -> ${P/-server}.tar.gz"
 
 LICENSE="GPL-2 QPL"
 SLOT="0"
diff --git a/net-analyzer/sinfo/Manifest b/net-analyzer/sinfo/Manifest
index f38ff20b2669..4cd4c3ac0d76 100644
--- a/net-analyzer/sinfo/Manifest
+++ b/net-analyzer/sinfo/Manifest
@@ -4,5 +4,5 @@ AUX sinfo-0.0.48-gcc6.patch 858 BLAKE2B 992c9b4e6546983ef8392afa846e3ef9d5eeaea9
 AUX sinfod.confd 105 BLAKE2B 3e031b8f0f7aafd1ff8ac7efb97bd87ed7a301fdd82b0de148e85a23a76ca77d0ddf770d13626ddfe1e41d5bc5e4f83b5b646a6f5b88a0941708fd3a13460a52 SHA512 c9ec8ad6dd6126bc9f2860cf6fe54b2119dda428d8eda8cea283b9755c4d64fdb933d81aa2da194b8453dbc6386d6b2306766eecc627dbd1bd8b226b4520ac88
 AUX sinfod.initd 212 BLAKE2B 137067cd9ef3a6f8dcef9997f3ba355bcc55aa6973533fdf9af7bf600c0c5e80f02f0374c15a630d30611302306a19be937f02f13bc41a9fa21e34c03daa642d SHA512 a26e3e1d8dae8a158299a214a7de569051bcfd3ab9dc3d92515767f896c5081efe886bc55b1d1d028547d8ed3d2a747408089f8de34712100e19a06cf5f07577
 DIST sinfo-0.0.48.tar.gz 703237 BLAKE2B b404aef3be802ecf00685b5fc36e8c53bdbfa7afcb4fe1f6339126c7d696ddcd19ea61cb611f94892cbf5ed12f50fe67f66a21c3727d9734d6d656e2b699c5c5 SHA512 9cbc790883dfd78970a5943599128f1af34a82362fa33e7d6f23d560806dce5955c45f7e82e79adcf7696166d1f39fd1856bae76087a3ba46d54e3e4963d4067
-EBUILD sinfo-0.0.48.ebuild 865 BLAKE2B 57a23e2547ced8f01d32844440600731daab5fbf7371afdffd3748897e70dea3fb4ba498a1f1d820a5f9fce7f772dcfb77303d802fd0a006425f15b97853fcb9 SHA512 fcc20e5b40660e5b0a77106be2f045edcf7b82694c370023431a9cb3c6baee9307c4bfae380b2542a9bce540889742185c8bbe92008e0daa0b72d7a1b1b1eb5b
+EBUILD sinfo-0.0.48.ebuild 902 BLAKE2B f64edb0df849d654db4f45ac4548bb4582bb4f4c27a3d43ab5fd96534afc6a41c194d1e30d35f4cbc8c71b800b5e577447990bb9f699bb25aef2e4457bac814b SHA512 5958ab9a7088daea231750ff56b612929837cd38bcc239f617dabe85fad90eb0347dac23862874516b04b881d5a97f899ca9bc6d7e7ef64f60327b53622fc031
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/sinfo/sinfo-0.0.48.ebuild b/net-analyzer/sinfo/sinfo-0.0.48.ebuild
index 1ced2d8e3ea7..fa99e6097fc7 100644
--- a/net-analyzer/sinfo/sinfo-0.0.48.ebuild
+++ b/net-analyzer/sinfo/sinfo-0.0.48.ebuild
@@ -6,7 +6,7 @@ inherit autotools eutils
 
 DESCRIPTION="A monitoring tool for networked computers"
 HOMEPAGE="http://www.ant.uni-bremen.de/whomes/rinas/sinfo/"
-SRC_URI="${HOMEPAGE}download/${P}.tar.gz"
+SRC_URI="http://www.ant.uni-bremen.de/whomes/rinas/sinfo/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/siphon/Manifest b/net-analyzer/siphon/Manifest
index 70442b1e5b13..980df9edd8fd 100644
--- a/net-analyzer/siphon/Manifest
+++ b/net-analyzer/siphon/Manifest
@@ -1,5 +1,5 @@
 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 637 BLAKE2B 562c829e73d6a71e4f42ee5431bded1f1d6de3cb91b0cbc843450ffdec9b761acbb6145767a72cfc9078f1a60049ae544ac434cf83177f3bf7273bd07eaafac8 SHA512 865e4ed633b9f90eca39f7f107fdd7b761a71d22557d6a4d025d089503264415d8517f56bf98277606739b4ec7f1bddd10871dd78c22623b43a603f33b4b28d8
+EBUILD siphon-666-r1.ebuild 654 BLAKE2B caca1c290089a463d214b53a7bce9828d200d6ad139fd478a5286efb35a252154c629f5bfbe56849f14afce56ca22a96ac81a7d8ee9062b5cecef2b036d07823 SHA512 40a8e9874bd3b9e561f4b43ec39964fa2727caada35603b883edce7c4b4e9184340408b6a0154b0bad81bfd45b7120a26ac54c392aa5464b4ed381bd9878777e
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/siphon/siphon-666-r1.ebuild b/net-analyzer/siphon/siphon-666-r1.ebuild
index 32c4e5b27bb0..a15e131ef1b7 100644
--- a/net-analyzer/siphon/siphon-666-r1.ebuild
+++ b/net-analyzer/siphon/siphon-666-r1.ebuild
@@ -8,7 +8,7 @@ MY_P=${PN}-v.${PV}
 
 DESCRIPTION="A portable passive network mapping suite"
 HOMEPAGE="http://siphon.datanerds.net/"
-SRC_URI="${HOMEPAGE}${MY_P}.tar.gz"
+SRC_URI="http://siphon.datanerds.net/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
diff --git a/net-analyzer/slurm/Manifest b/net-analyzer/slurm/Manifest
index bdd3de80b850..f186b1080154 100644
--- a/net-analyzer/slurm/Manifest
+++ b/net-analyzer/slurm/Manifest
@@ -6,5 +6,5 @@ AUX slurm-0.4.3-version.patch 170 BLAKE2B 21d810de2df77546c584d66c85d180054b3f56
 DIST slurm-0.3.3.tar.gz 122839 BLAKE2B 2633ab72c6fa32c66a6573937241a3053644ea33ad43d6646a1f0b54e34367254f3185fea5ea7cd31fbd09d640bc56033e6b74ac74817ee4262511ee90a262f0 SHA512 67ffef9d0fc6239e2a742b2020a2a1fa913a6f0d681ffb7fd00611265e60b39f83b18cbd782ce841b6b39ed0db2c40cd6410d7f5d9408bf0eb0361b95949a8a3
 DIST slurm-0.4.3.tar.gz 36076 BLAKE2B 468dadfb7e338a7b11a2db8501763fa75e9f82af1c7411d132c6aec2e8426cbd1170fb9657a661dde35c77d6ad23497599affc9b36e583772950a2bf30715c20 SHA512 f55005e2e2acebf1b7be0f7106511f83123f4df30305d00495940220f99394ddd48193ee4985c91604f294487c181f6efebe9452137f7df5b9675d2c3388892f
 EBUILD slurm-0.3.3-r2.ebuild 771 BLAKE2B bc0919c9de9e4c97929cf51cbcd0e4a241262ab92bd4017ecaba0cf2884d57793a25b28bcc9761f6c8505559789f0d87774265c4dc1fbd7a8a31d76970a5e9c7 SHA512 2e528680ff2ddd6b31c4b8c2ad49a4b3a21e7da0d8f504100f6588cbe480fcfdd5f2e3a58a60c26360313c526cf9dddb4c77746e1e5938766e7ea1277b36accc
-EBUILD slurm-0.4.3.ebuild 667 BLAKE2B 1f76049a662084feb021d8a185d4ff057cab86088eb6ab4057cd083ea02abeddfeeeb293e94f2cb5080e6e33fd6024c68a5303260619206815f9f8f114a17264 SHA512 1ad6cec33eb1f57a95cef30ab022a26c7b1dd2d927ffd8468f75a4e5ac37a3eb8ffa5a48b120ea803e8999dd8dc4b03342de18255ef7b64e2d459cdb1c509885
+EBUILD slurm-0.4.3.ebuild 690 BLAKE2B 078a3ff29f2cf4bb07c30970f5caffd00dc526111bf53ed1ecd2fa7c0e9a474eaf714b50899cc9a206e4a2e4a78cb2b3c2de4988a4da0d83d3cb2ffa7c443f2b SHA512 83a13d0e9bd3d6a47c15cc22bc3493759da44ff0530ac949acc4b74c4d236fd78a49242dad0b18f2e698b90d30fa5ed2769b8bdf35fd1a8097a67b34482dda1f
 MISC metadata.xml 360 BLAKE2B a7b740796c57e64abb029e278f22e04a9af73827f35a2b1576b4f955d74c23cd1c16c9215b831f46030f55bfa0727bd50ccfa31ca7ad999bc574dd6cc4b575bf SHA512 bcef8916863832f9192e7df51f693b87836b74663da01a1b7f330569e10ffed23de36a6c5ffbde968ec4270bd2fcacec3f12f78b700cdbfc001c34862e497f12
diff --git a/net-analyzer/slurm/slurm-0.4.3.ebuild b/net-analyzer/slurm/slurm-0.4.3.ebuild
index 91c9d7933c20..b801e7422f1b 100644
--- a/net-analyzer/slurm/slurm-0.4.3.ebuild
+++ b/net-analyzer/slurm/slurm-0.4.3.ebuild
@@ -6,7 +6,7 @@ inherit cmake-utils
 
 DESCRIPTION="Realtime network interface monitor based on FreeBSD's pppstatus"
 HOMEPAGE="https://github.com/mattthias/slurm"
-SRC_URI="${HOMEPAGE}/archive/upstream/${PN}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/mattthias/slurm/archive/upstream/${PN}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/sngrep/Manifest b/net-analyzer/sngrep/Manifest
index 54b859ed3fc2..bc5191635b70 100644
--- a/net-analyzer/sngrep/Manifest
+++ b/net-analyzer/sngrep/Manifest
@@ -1,4 +1,4 @@
 AUX sngrep-1.4.5-tinfo.patch 237 BLAKE2B 2ba30ab0828f475e790175d8c3dcd25160ff691194ebb6b8e86380251863b40ef52bd942cdd65c694b84bae8de8d216244f9ab5fa75066e640b8427099a39342 SHA512 7c47e530caa1c44f8452a536925fd1133a1f0aad3822117e5ce2e1b7b03307a90423d70bb031639305b638d4c6732d980f3dbe617adc489fd0c2b438354f5ce6
 DIST sngrep-1.4.6.tar.gz 235721 BLAKE2B e01f2a1d83b9147b99196f7ff2e5562552b16badc2ca634e63b2e2f5955a5d0328c9fcdb841f42a950899511a81fffd8eb64169758dc319875e3052d4359de93 SHA512 25c67e26158b140bded775b217f313ad5a6268684f03d0b9875ddd423d7548b50fa9c358346330d3873984f456aefa9401c2b0fdd136dd95061e34da6530bcc3
-EBUILD sngrep-1.4.6-r1.ebuild 817 BLAKE2B 5508ec30250296fbc378d403f3baecae5394664b8bd8ed1a157de279f7cda50b4a822dcf50968313ae37ba4cd2f2fa1d4b6b3f11be1bd6a9ac2fd31ad031c173 SHA512 bc0845fcfe1a8649d3b66105e00e54b0915069cca3b2c8ed4261f6805b5c91ef56e812c8b033a515600d6ce4c75ee4f6541d127009f001afb3fbd38be27ba50b
+EBUILD sngrep-1.4.6-r1.ebuild 839 BLAKE2B 80239614d7d20b437c13e893d30094275d7e32521cb721cc104362d02f3cebcd593988a795f670ce08dba0225dc5704036eae70dc120161a86ac85ace50a22f4 SHA512 273d894e39a7700161a619691f50a1f862b1944d379b0742f15858805d418b10d9f5fdd628cd956c81bda6079e92a6de1b6fca976040077310a8c197817b5854
 MISC metadata.xml 468 BLAKE2B c4ecbf2a09c6361f3cdd82c6c2280d1885565eb1a834be6093b3acbde6ecad83b49026524c68b067bee7f2764dbf4d3bc73e7e8fc5d13ac499a04001c97b1b30 SHA512 def85ed081107978cef4e8cad0ce80a0717c5c644494ebb907a9a616ad571f13e518019d6d51447f05f1a9545c739dd31874d888cb06ce91ecc224fb2c40e446
diff --git a/net-analyzer/sngrep/sngrep-1.4.6-r1.ebuild b/net-analyzer/sngrep/sngrep-1.4.6-r1.ebuild
index 6211329ed152..54df7038d92f 100644
--- a/net-analyzer/sngrep/sngrep-1.4.6-r1.ebuild
+++ b/net-analyzer/sngrep/sngrep-1.4.6-r1.ebuild
@@ -6,7 +6,7 @@ inherit autotools
 
 DESCRIPTION="Ncurses SIP Messages flow viewer"
 HOMEPAGE="https://github.com/irontec/sngrep"
-SRC_URI="${HOMEPAGE}/releases/download/v${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/irontec/sngrep/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/net-analyzer/sniffit/Manifest b/net-analyzer/sniffit/Manifest
index 3efc1fc3004d..959751a8f237 100644
--- a/net-analyzer/sniffit/Manifest
+++ b/net-analyzer/sniffit/Manifest
@@ -1,9 +1,9 @@
 AUX sniffit-0.3.7-gentoo.patch 1164 BLAKE2B 0d35dab5ae42180ae0eab4133f2a5c752d39fbf20577b06d697ea2bcfa745c3fa51b2318e5043783eea0c54c398478f8939d050fcb9a6c28aa4e3ac483f09135 SHA512 e71684e0be70228c347fe61afdee7e6bf0f116b0ecb603ed4dd6838f457b5b480092ac735297ce64f84f9c8858b5b11d7a1e746c0790380fbf6f7cf8d9875865
 AUX sniffit-0.3.7-misc.patch 2957 BLAKE2B 7315c4f977642819cb7ccff3f1337d5d3f0ee4a298a6984338a44cd8f1295a6a490aeb89e4d06d61c863665f67ca8894951fe4a3d1d52d226895581d84038e49 SHA512 d07298642bab1903c7a93a2b076dcf2cf50a2a5ef5b05e7e9abacaa88cff3089c9028e7721cacbc403b992ad170f64976e83835e441b44e6ac69ee0753e2714e
 AUX sniffit-0.3.7-tinfo.patch 1063 BLAKE2B 8d3b781c7c71201639ba77e8dadb063dd85d7bd0a04c4717bb2f6dbad8b2245f2a43b6c563567f813e76f2bc3dab5d414081cd8c337a8ff81e4bab3856d7cd29 SHA512 d4959d6c27928c3d3f85fdfdfb1afd4f7ad24000adb61f565fef68b46b46aba96b61572177db058875dc3a70154223cb620077e6681c8a7f62483e614f8e92c6
-AUX sniffit-0.4.4-tinfo.patch 434 BLAKE2B 15295b6ed19928dcbf9f3905278cb3e3390bcf34feb7eb59ac438bba61459625376b6a9c2903605fd4a232db42ce9b782d50a2ebd43b1fa0a1e83b886daaa7ac SHA512 27d5e6fa9bc786b5a3018d26613131e257e5f4cfe0e688b1868857521d7aa931b41319dee7abfd6ef8d76c24f28bfef699c48e82df6e24c90507e1ee462e47d6
+AUX sniffit-0.4.0-tinfo.patch 434 BLAKE2B 15295b6ed19928dcbf9f3905278cb3e3390bcf34feb7eb59ac438bba61459625376b6a9c2903605fd4a232db42ce9b782d50a2ebd43b1fa0a1e83b886daaa7ac SHA512 27d5e6fa9bc786b5a3018d26613131e257e5f4cfe0e688b1868857521d7aa931b41319dee7abfd6ef8d76c24f28bfef699c48e82df6e24c90507e1ee462e47d6
 DIST sniffit-0.4.0.tar.gz 59640 BLAKE2B 0cb335e7fc308155d0b3b3163695745ba1b0b71f212341238074d80782d99b12ed3f4991eed766161bfb65aeffe8bbf5e8e71a987b431fd414ac34ab0be416ab SHA512 a31c39859ab308f3ad4bf2f32a61d0f419ed6ad5d1668efc79e996c4a99557e511fc0b36c21e30316cfa82217fb10fd16d4e3473f5f1fdd70cdeba959d643aab
 DIST sniffit.0.3.7.beta.tar.gz 212419 BLAKE2B 938f4eb775cfd0c604ec107573b8e4bba93fc60b40428ae3894b008fa4eaee3c9bf1ef29daf28caef4f22c4574faf2c6a8e3e8c32b7f84d643b8364ab31412ab SHA512 b32d1f17d589ee1d1afc7986640a2b9f451cdb26ee2d077db1eaec1bb77ed353bbbb6a79bd25f915b3a40b7a279f9fc7855706150ec3a24f8937a152ac91b8d1
 EBUILD sniffit-0.3.7-r4.ebuild 792 BLAKE2B 91723d785619de8ab8de16708d365e07a43310e093cae0f3b794d5b38054588a9760cf9c26639feef7cb83f612aacfe08b804ff585ec2b01469ac54105254c12 SHA512 2f44f2881473aa1744c62b68d6eab2f4eebf9470a17a069430bf9c2fdaef1c755de543c42d9153d975cc1bef7a848ae8b78398a56f1400c4d1280d5ddc344d35
-EBUILD sniffit-0.4.0.ebuild 538 BLAKE2B 00b519b5ca3d480e6aaa2182902d916b13f88ec78732aeaceb2b6ad9c72d7353b734ce0b1614f7ab4450e43efa9bf18dc59f2b4506517e019e63e006e3d31b47 SHA512 4100dfa8a93c0be3d43a11c0a7d07900461d0fe23dc402a0845ff687ac0bbbc8df7f216e2f99fb484577bae36076d718e5750fd1f19df2622c5f60b9fe80eaf9
+EBUILD sniffit-0.4.0.ebuild 587 BLAKE2B 70f3b41f380075af20c2ce630bf4752a424d48badd00ce10aff803bc8a938b2e9990f5e47b9f0df82a6ffb1a88bace06ffeb193b7c7d313b1e3fea15934783cf SHA512 590199b70c414ffd649e7db6f790be0aea3395a1de705a50edc652b18e38573b96ade3271a1cb40fd6d925fa043f3f56b8c5f04214ca16664f61d903822b485d
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/sniffit/files/sniffit-0.4.4-tinfo.patch b/net-analyzer/sniffit/files/sniffit-0.4.0-tinfo.patch
index 85e266fb5d13..85e266fb5d13 100644
--- a/net-analyzer/sniffit/files/sniffit-0.4.4-tinfo.patch
+++ b/net-analyzer/sniffit/files/sniffit-0.4.0-tinfo.patch
diff --git a/net-analyzer/sniffit/sniffit-0.4.0.ebuild b/net-analyzer/sniffit/sniffit-0.4.0.ebuild
index 33937675b70c..a4e8e10f5060 100644
--- a/net-analyzer/sniffit/sniffit-0.4.0.ebuild
+++ b/net-analyzer/sniffit/sniffit-0.4.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
@@ -6,7 +6,7 @@ inherit autotools
 
 DESCRIPTION="Interactive Packet Sniffer"
 HOMEPAGE="https://github.com/resurrecting-open-source-projects/sniffit"
-SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
+SRC_URI="https://github.com/resurrecting-open-source-projects/sniffit/archive/${P}.tar.gz"
 SLOT="0"
 LICENSE="BSD"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
@@ -19,7 +19,7 @@ DEPEND="
 	${RDEPEND}
 "
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.4-tinfo.patch
+	"${FILESDIR}"/${PN}-0.4.0-tinfo.patch
 )
 S=${WORKDIR}/${PN}-${P}
 
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index a8557aed9d9f..bf8bb00dc8e9 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -6,9 +6,11 @@ AUX snort.rc12 1469 BLAKE2B 6238dfc0f9e178fca864ee9485b8cf59c3056d8b047ee5fd6208
 AUX snort.tmpfiles 32 BLAKE2B 39e4f2491f52d2a369b1c4747468ea3a9d5f2c05a85adb4666e733929be16b9cf868ea6878d3d71271dd8ee05ad8e8fac52c4f4ebfd17da873a3dc64c5368810 SHA512 705e49c172ba7bc0afee9910dcbf7b4ee96f05e6d3030c7928bbeb0df658aefb5f61fddd0da078b257ee9a0c86d1750e7b44d6f61d8e56ab799044cd141964b5
 AUX snort_at.service 327 BLAKE2B 36039657ae5a5b7a37585baebc3de15f32f457b3df6313621eea6bafe3e8a34626960bd4adafe110f36f75a15bae8fc045a6e3267b960249536a0f10ac05b88f SHA512 af48018d232eec181eff2f3aa240e11744911874ee08a0311474d73bffcf1e567102ea6d42a26520dd5a1a3c66530d8d3f19fc4b4753b6ac0ae55eb3200747e0
 DIST snort-2.9.12.tar.gz 6456877 BLAKE2B af5584fe01caf9af2f2188e1362bd927a884354ddcb3026af514dddc1264b557691e1644d3c24e85c3b5b5f515dd9fccdd8d38ebc7c28d2f384fb822e27d8bb8 SHA512 6f759b321ca5496abf27c9e4f4fa003cd5167f8c8a160bf5f0b1aee1a93aa8d27de89b84bdf993a0bfb3a93c6315cb2bdbdc3fdb3b09b8d4d1d3c22b69c6783f
+DIST snort-2.9.15.1.tar.gz 6618999 BLAKE2B d9f661b036afa2130d406f8bcfa8d33fca482983e0e4785218e08899104c9069809b089631940109ee31e8d197783d994c58417d94f4b5282702e51466f828fa SHA512 9940f5bcdcf04823f9cb5c3f8efda72f98f6a47bce9f40399dec9ec41d23a386c7f7e44861d82368de31546123b920f9fc617197bbf9c5e750724bf8b9e19590
 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 8847 BLAKE2B 9bf936653b94ad7bdf1cb0634cdf126b6c735240f089e589de424527bd2d3c062ba090231dc2f4cf99a667a95db3274b8d252d31a6bb21268f705e84ccaf6703 SHA512 58fc58ea9ee1fb1659969061f0ca037f37afa6f7f7b8e856b6b4f2b6432cffd04228f2dc0d630def5fd1a10914f76723477192a1aaa2a4eb9fa4677809ce679c
 EBUILD snort-2.9.15.ebuild 8847 BLAKE2B 0103540218a24cceb191285c4dac236621c25f140a4842c7bf70cd3e438afcdebdacf66d9a23de6319028b7f7d8e891f3f2e1eaf0230bc8b034dc1b2e3b34ea5 SHA512 52e5f4bd4f68bb5a85ce4bd27e8067d6ed16b9586fd92f4dce18ccf4380232a78c8249967dc85a9e181c68b70ac3d3d92aa402bf24b146051f465d47e84e2e89
 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
new file mode 100644
index 000000000000..03b19a935318
--- /dev/null
+++ b/net-analyzer/snort/snort-2.9.15.1.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools user systemd tmpfiles multilib
+
+DESCRIPTION="The de facto standard for intrusion detection/prevention"
+HOMEPAGE="https://www.snort.org"
+SRC_URI="https://www.snort.org/downloads/archive/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static +gre +ppm +perfprofiling
++non-ether-decoders control-socket file-inspect high-availability
+shared-rep side-channel sourcefire linux-smp-stats inline-init-failopen
++threads debug +active-response reload-error-restart open-appid
++react +flexresp3 large-pcap-64bit selinux +libtirpc"
+
+DEPEND=">=net-libs/libpcap-1.3.0
+	>=net-libs/daq-2.0.2
+	>=dev-libs/libpcre-8.33
+	dev-libs/libdnet
+	net-libs/libnsl:0=
+	sys-libs/zlib
+	!libtirpc? ( sys-libs/glibc[rpc(-)] )
+	libtirpc? ( net-libs/libtirpc )
+	open-appid? ( dev-lang/luajit:= )
+"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-snort )"
+
+REQUIRED_USE="!kernel_linux? ( !shared-rep )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.8.3-no-implicit.patch
+	"${FILESDIR}"/${PN}-2.9.8.3-rpc.patch
+	"${FILESDIR}"/${PN}-2.9.12-snort.pc.patch
+)
+
+pkg_setup() {
+	# pre_inst() is a better place to put this
+	# but we need it here for the 'fowners' statements in src_install()
+	enewgroup snort
+	enewuser snort -1 -1 /dev/null snort
+
+}
+
+src_prepare() {
+	default
+
+	# Multilib fix for the sf_engine
+	ebegin "Applying multilib fix"
+	sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
+		"${WORKDIR}/${P}/src/dynamic-plugins/sf_engine/Makefile.am" \
+		|| die "sed for sf_engine failed"
+
+	# Multilib fix for the curent set of dynamic-preprocessors
+	for i in file ftptelnet smtp ssh dns ssl dcerpc2 sdf imap pop sip reputation gtp modbus dnp3; do
+		sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
+			"${WORKDIR}/${P}/src/dynamic-preprocessors/$i/Makefile.am" \
+			|| die "sed for $i failed."
+	done
+	eend
+
+	mv configure.{in,ac} || die
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable !static shared) \
+		$(use_enable static) \
+		$(use_enable static so-with-static-lib) \
+		$(use_enable gre) \
+		$(use_enable control-socket) \
+		$(use_enable file-inspect) \
+		$(use_enable high-availability ha) \
+		$(use_enable non-ether-decoders) \
+		$(use_enable shared-rep) \
+		$(use_enable side-channel) \
+		$(use_enable sourcefire) \
+		$(use_enable ppm) \
+		$(use_enable perfprofiling) \
+		$(use_enable linux-smp-stats) \
+		$(use_enable inline-init-failopen) \
+		$(use_enable open-appid) \
+		$(use_enable threads pthread) \
+		$(use_enable debug) \
+		$(use_enable debug debug-msgs) \
+		$(use_enable debug corefiles) \
+		$(use_enable !debug dlclose) \
+		$(use_enable active-response) \
+		$(use_enable reload-error-restart) \
+		$(use_enable react) \
+		$(use_enable flexresp3) \
+		$(use_enable large-pcap-64bit large-pcap) \
+		$(use_with libtirpc) \
+		--enable-mpls \
+		--enable-normalizer \
+		--enable-reload \
+		--enable-targetbased \
+		--disable-build-dynamic-examples \
+		--disable-profile \
+		--disable-ppm-test \
+		--disable-intel-soft-cpm \
+		--disable-static-daq
+}
+
+src_install() {
+	default
+
+	keepdir /var/log/snort \
+		/etc/snort/rules \
+		/etc/snort/so_rules \
+		/usr/$(get_libdir)/snort_dynamicrules
+
+	# config.log and build.log are needed by Sourcefire
+	# to trouble shoot build problems and bug reports so we are
+	# perserving them incase the user needs upstream support.
+	dodoc RELEASE.NOTES ChangeLog \
+		doc/* \
+		tools/u2boat/README.u2boat
+
+	insinto /etc/snort
+	doins etc/attribute_table.dtd \
+		etc/classification.config \
+		etc/gen-msg.map \
+		etc/reference.config \
+		etc/threshold.conf \
+		etc/unicode.map
+
+	# We use snort.conf.distrib because the config file is complicated
+	# and the one shipped with snort can change drastically between versions.
+	# Users should migrate setting by hand and not with etc-update.
+	newins etc/snort.conf snort.conf.distrib
+
+	# config.log and build.log are needed by Sourcefire
+	# to troubleshoot build problems and bug reports so we are
+	# preserving them incase the user needs upstream support.
+	if [ -f "${WORKDIR}/${PF}/config.log" ]; then
+		dodoc "${WORKDIR}/${PF}/config.log"
+	fi
+	if [ -f "${T}/build.log" ]; then
+		dodoc "${T}/build.log"
+	fi
+
+	insinto /etc/snort/preproc_rules
+	doins preproc_rules/decoder.rules \
+		preproc_rules/preprocessor.rules \
+		preproc_rules/sensitive-data.rules
+
+	fowners -R snort:snort \
+		/var/log/snort \
+		/etc/snort
+
+	newinitd "${FILESDIR}/snort.rc12" snort
+	newconfd "${FILESDIR}/snort.confd.2" snort
+	systemd_newunit "${FILESDIR}/snort_at.service" "snort@.service"
+
+	newtmpfiles "${FILESDIR}"/snort.tmpfiles snort.conf
+
+	# 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"
+
+	# 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"
+
+	# 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
+
+	# 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
+
+	# 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
+
+	# 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
+
+	sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \
+		"${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
+
+	# 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
+
+	sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \
+		"${ED%/}/etc/snort/snort.conf.distrib" || die
+
+	# Disable all rule files by default.
+	sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \
+		"${ED%}/etc/snort/snort.conf.distrib" || die
+
+	# Set the configured DAQ to afpacket
+	sed -i -e 's|^# config daq: <type>|config daq: afpacket|g' \
+		"${ED%}/etc/snort/snort.conf.distrib" || die
+
+	# Set the location of the DAQ modules
+	sed -i -e 's|^# config daq_dir: <dir>|config daq_dir: /usr/'$(get_libdir)'/daq|g' \
+		"${ED%}/etc/snort/snort.conf.distrib" || die
+
+	# Set the DAQ mode to passive
+	sed -i -e 's|^# config daq_mode: <mode>|config daq_mode: passive|g' \
+		"${ED%}/etc/snort/snort.conf.distrib" || die
+
+	# 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
+	sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \
+		"${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
+
+	# 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
+}
+
+pkg_postinst() {
+	tmpfiles_process snort.conf
+
+	einfo "There have been a number of improvements and new features"
+	einfo "added to ${P}. Please review the RELEASE.NOTES and"
+	einfo "ChangLog located in /usr/share/doc/${PF}."
+	einfo
+	elog "The Sourcefire Vulnerability Research Team (VRT) recommends that"
+	elog "users migrate their snort.conf customizations to the latest config"
+	elog "file released by the VRT. You can find the latest version of the"
+	elog "Snort config file in /etc/snort/snort.conf.distrib."
+	elog
+	elog "!! It is important that you migrate to this new snort.conf file !!"
+	elog
+	elog "This version of the ebuild includes an updated init.d file and"
+	elog "conf.d file that rely on options found in the latest Snort"
+	elog "config file provided by the VRT."
+
+	if use debug; then
+		elog "You have the 'debug' USE flag enabled. If this has been done to"
+		elog "troubleshoot an issue by producing a core dump or a back trace,"
+		elog "then you need to also ensure the FEATURES variable in make.conf"
+		elog "contains the 'nostrip' option."
+	fi
+}
diff --git a/net-analyzer/snortalog/Manifest b/net-analyzer/snortalog/Manifest
index 7726c5ed566d..f7f0cb5c6694 100644
--- a/net-analyzer/snortalog/Manifest
+++ b/net-analyzer/snortalog/Manifest
@@ -1,3 +1,3 @@
 DIST snortalog_v2.4.3.tar 1324032 BLAKE2B dae81fe861c7d85ce5fce63ffe773cccb8b643654a861e1b9cc91db22e5683c4a5d2c83ee6a1895386777c600b004978f91e3ed8a333397139bfe6f9644a79ce SHA512 b4b8558865ae4d1ef932114f2a2fb5af7fb069f1b587955d9d489a31635e890fb0ed36ebcde19322ab0c0cae49734da08602e283bd731c769de527abf7d74d06
-EBUILD snortalog-2.4.3-r1.ebuild 1413 BLAKE2B 4c808ac7b0ccd3deab9eaf8ed52b5bba2bb24d48eeed435a37a7c6cfe5a44b0a74ae9dec12f96244666576ad2647cb456531e13c134ae2e1800f276b7ecbaff1 SHA512 84f49834bfe4ee02c62006adf344d1f88b0c3e61cd195e075df77aa5f24e035d5bdcd852d2b863f95bf1ddad7b6dee20b801ee1dcfd0da99a07f68850dee3b4f
+EBUILD snortalog-2.4.3-r1.ebuild 1443 BLAKE2B a09dbfa6965e753e7f7007fae89972e4a4332131bb94e1b5ed9f98baad731aa2f22f7f0c7db2af43cfacc6f66352d327a37c6afaf08b12d9312025f5c77d818d SHA512 54ae5a4c598c5547ffc891772511e9ff4609cbe5bcfd3f5b59250e2080f3a512c45aee7c262e103aece18aa3af31f9e9f25f540a682064f8e38c04771b057099
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/snortalog/snortalog-2.4.3-r1.ebuild b/net-analyzer/snortalog/snortalog-2.4.3-r1.ebuild
index 5aef758892c9..6390a863055e 100644
--- a/net-analyzer/snortalog/snortalog-2.4.3-r1.ebuild
+++ b/net-analyzer/snortalog/snortalog-2.4.3-r1.ebuild
@@ -8,7 +8,7 @@ MY_P="${PN}_v${PV}"
 
 DESCRIPTION="a powerful perl script that summarizes snort logs"
 HOMEPAGE="http://jeremy.chartier.free.fr/snortalog/"
-SRC_URI="${HOMEPAGE}downloads/${PN}/${MY_P}.tar"
+SRC_URI="http://jeremy.chartier.free.fr/snortalog/downloads/${PN}/${MY_P}.tar"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/net-analyzer/snortsam/Manifest b/net-analyzer/snortsam/Manifest
index 5dc3dd529ab3..1fb525a24542 100644
--- a/net-analyzer/snortsam/Manifest
+++ b/net-analyzer/snortsam/Manifest
@@ -1,4 +1,4 @@
 AUX snortsam-2.70-gentoo.patch 8979 BLAKE2B 7df4e769ed440b5bd595b6a62a414d9172ec283ab6f48bd00f5ede432c7430c1c936a9915ca40857216e926ccf7354cf45743e97fdbd945374efe01e403a928c SHA512 17f5b03820491ffbd8eda4b5cc99230ab358788194eb07221a303e98cc0ef5855d347804b30bd21f38d2a6f0e370f2433a691a33db0599c50887857bdadb53b6
 DIST snortsam-src-2.70.tar.gz 1971624 BLAKE2B 10f26afb8addffb52db099e0c376a9adb884b625503233b72203070cadc79a688c7a6950014759d6fb58c8844899482057d9701e9eaa5e9d12066f10e88d6421 SHA512 e0b6d53dfc0963e5a0012e25c1cd15f76263cc0d0158f6a50eab3876f1ae40c47eeafb7309113d27f1ca92d5491a19e32748c3bf51754be9320346ebbf26e5b1
-EBUILD snortsam-2.70.ebuild 1003 BLAKE2B 2ab1efd8bf874af8990a8849d92f93a6798e16432068105f868feb4935987b87aaab7203ebe9fe02abbb5ede30d1a4232f4ba77facea13ecfeebb5c19a2f5e87 SHA512 3b0e94f42990aa06f6751fcee991d7bf5966b88a6c88b919e5ea29e37d734797afe30761ed6e6d01dbafe096a42d0cb86354c58c0ad09f0f7391adaab6ec7d41
+EBUILD snortsam-2.70.ebuild 1016 BLAKE2B 77da56ae43a92d80c55c79f0d589cb7b8823cad67a0b848b9478130e9f1044d0c12eee24444811395374b8e410e54d3796453ebd760c50315caa32760d2c3c8f SHA512 fe5922bac32f95881fbe8c679089bd94e232c76aa623b5ebda3dd9c26d1743f2a1a831b2a83a22e1d643addac452226d3138582167fefd333afab3482cd343a7
 MISC metadata.xml 286 BLAKE2B a278f67a760b977849da10dfbc6f2da19da66b553e51f6a7f32403dbb8eca85432dcec745815bc9b55596bf5eece7916ddd7657360d110d91a83b6077eec2619 SHA512 cfd1ca7999686b831b0b459f5b06ea80fd28b4f24d3404a8ad90bb4d6461a011f6a2b338ebbf45c2eac621ec828dcc397b26c2ae82068e5b703271a85c76e760
diff --git a/net-analyzer/snortsam/snortsam-2.70.ebuild b/net-analyzer/snortsam/snortsam-2.70.ebuild
index 041a219e5cb9..601d77474682 100644
--- a/net-analyzer/snortsam/snortsam-2.70.ebuild
+++ b/net-analyzer/snortsam/snortsam-2.70.ebuild
@@ -7,7 +7,7 @@ inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="Snort plugin that allows automated blocking of IP addresses on several firewalls"
 HOMEPAGE="http://www.snortsam.net/"
-SRC_URI="${HOMEPAGE}files/snortsam/${PN}-src-${PV}.tar.gz"
+SRC_URI="http://www.snortsam.net/files/snortsam/${PN}-src-${PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/net-analyzer/speedtest-cli/Manifest b/net-analyzer/speedtest-cli/Manifest
index 4f620d67cf46..8cb2e9f30fdc 100644
--- a/net-analyzer/speedtest-cli/Manifest
+++ b/net-analyzer/speedtest-cli/Manifest
@@ -1,5 +1,3 @@
-DIST speedtest-cli-2.1.1.tar.gz 24380 BLAKE2B ea6f5fc3127246ad4cf90dee4b53529fa9f3b9b9558c9ebb92661380663a5e5950490e91cda97f9207b26c23464026b91c8faa50ef5a515b817b0f84fcb2e13b SHA512 afc1fc0264d5124efe5afc9b0583b2b37ae50eac229e6971656a906b9a7a78d44158485d5c2e44c3430694fd7355926f578a54a196cc9b9baf6cfbc357a789d1
 DIST speedtest-cli-2.1.2.tar.gz 24741 BLAKE2B 09418e34d92e0f91d7482ba4cc46cf812b43f25118c71a8e5127265f62ef93bb428ebfe5cc65a73ea8284fb7bfe1a99cc670d5d186f9e82284a11390f6e66960 SHA512 f2eb125116f42075d3248e1c0590cce4f822f383ff7c54c158504b16de72bf35b35d55a78014413a95a5f5bafa98c71c3ea011f20f480f1db272d6e8800c40bd
-EBUILD speedtest-cli-2.1.1.ebuild 657 BLAKE2B c8b00de926affe916ab2929dcf95e0cc2822babf6ab81ca0c7d4b51ec619050c3cb6d5d6ef7645c298c49e752f51ab73fb6f55a1f5bd762dc9c7656b8495f6a9 SHA512 791dff89b2d0e2b69103a218cca70801a01a83e6b156d338081f6cea917667564f6c1783325a661e3613460e1750487209f998f55622b90cac521839d49fc9ee
-EBUILD speedtest-cli-2.1.2.ebuild 661 BLAKE2B 6dbca712919867894da38ae045b6b737b7b50f79b70a7aab04373aeb086928888d486e33728073108f7ce1eb2b350598f7c0ba9a28b825a7d759c503d8c03e86 SHA512 6085506ffd9e89f83538e7aae5a816c50b0f9a87e3a945633ac1631d3d46344ba1839030eff091eeecaa0dc5651aef6bd96aaf41f70179470b462c78f297c7f1
+EBUILD speedtest-cli-2.1.2.ebuild 657 BLAKE2B 0d688690a2a8b0f794a671e1065526b972322cd06fa9e718fe375477f1c095cd8ff038d807af3abc466f92a75cfa36875ad7ebf55cd7b0750d01424204a58f49 SHA512 6d4a2b3bb5a0e2579fc47426371a34ac88343f551d137c6a81f3aea8dfefbab4dee6f578d28acf0d53e975d780c7892396a88005558e69cf64a258f056b8e8b0
 MISC metadata.xml 460 BLAKE2B 488a43d888cbc4baa7d74bcf4b8852054037be8227f380d43f187baba239e253c2a0aa3ce1d8c2c672a4947be9e4268a2d1fa8adbb3db38fee9e2334851bc7eb SHA512 6e911380a7bc75a4f5726f4bb8f864a2660e93cb07be2cdf55b428fe8615e9e31c7a78f978064ed73fdc1133d6611b3bc3a39966439bb249e4f8a69dbae88f1c
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-2.1.1.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-2.1.1.ebuild
deleted file mode 100644
index 4ecee2742840..000000000000
--- a/net-analyzer/speedtest-cli/speedtest-cli-2.1.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Command line interface for testing internet bandwidth using speedtest.net"
-HOMEPAGE="https://github.com/sivel/speedtest-cli"
-SRC_URI="https://github.com/sivel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-DOCS=( CONTRIBUTING.md README.rst )
-
-python_install_all() {
-	doman ${PN}.1
-	distutils-r1_python_install_all
-}
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-2.1.2.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-2.1.2.ebuild
index 8c5b2bfd8f88..27192fa2eb34 100644
--- a/net-analyzer/speedtest-cli/speedtest-cli-2.1.2.ebuild
+++ b/net-analyzer/speedtest-cli/speedtest-cli-2.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/sivel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest
index 5260932c6316..dd9b600ed057 100644
--- a/net-analyzer/suricata/Manifest
+++ b/net-analyzer/suricata/Manifest
@@ -1,8 +1,10 @@
-AUX suricata-4.0.4-conf 2767 BLAKE2B fe356820f57a8a7b068b66fd8c012c94a9bffdc8a62e2bd4a2210a9625778fa358a303bc770aeb4b1600ed8da5443533c50356ac4dfdabce6d0438ba246e1cd4 SHA512 fd3aec48b4e7e52f192af117f3cda063c5614f33082986dca4e3bdf7a46d62655cd03a1d723db9d36a1b1f84964dc2273e3bf00fb23648902639b18a64025d6b
-AUX suricata-4.0.4-init 5496 BLAKE2B ea7922c300f3f42450e9c84b696a1389887ec062588a29cab201a70a2a2c1d52ce63d89642d85c584737594606ddc212d84632308de401504db80c60226872de SHA512 3b0294a0db38524f2a5126fb66000700cee2f1d10a10f35b5cb2a3598c4e41de72015719bbcf70da46f15505f2ac4b3afb2a4fa040fae68f0b1088ae40d5457b
-AUX suricata-4.0.4_configure-lua-flags.patch 502 BLAKE2B 14693f51888ba8d41a736a91065d1376e542d7c41d53dcc3ed9edd95d10f1db30a51d8b244154406a98338f844e67e2f836bcfc44bfa6dd6d0ffc19332c6a2c0 SHA512 a1be159aa592f2121b5e3fde70485e6a502cdfbd15fc76056e6ca1401a94ab7eddf1639728fa402f754ca546229aa5fd6fc05c243be761475c9249a7206b2830
-AUX suricata-4.0.4_sockios.patch 298 BLAKE2B 2a3fd2b8ace6363f90ad52f2f9802cd9565d3aabcc1d5fec4b2b0b9690110d7b28fa8d6be39d357b9dded7f2f09ba9b21e3837d92cac42483e0015ef76669ec8 SHA512 416cc3ff7636f7938e35a449bea41d2f4a02dacb80dce0821091db690279f966ef048a036a4b47b9f9208039b9103366500afcd0d6b3e85d8fe96372a0b3921a
+AUX suricata-5.0.1-conf 2771 BLAKE2B c9f9ac6707f71ace993bcf730df5aab11a6e59fcbb636140a110d2ec636587bca600938af55a7d709ed0994c38095c0a8d505d2af9912ea3aaf1be20e098043f SHA512 4c8c1d0c101e850b39358605451df37427bb94f1b55836078aeb0b4e3720f5bdef01d4bc9d4ddfb3436c822c7bd8796112409421a7d90cf40ec81a6a24c3d6dd
+AUX suricata-5.0.1-init 5480 BLAKE2B 48c9484c824f7216d1c4d64394a60b5a5b2c1f5781e8faa775d56765680dd27cb886daf61da7e93f78469f2947f38bd044804acc79f2fb3c40477aff0f470f13 SHA512 6756cebe424b057884904e716af05e74bf2cfc47461a6081b4ff45144d1fefb568ffc3aaffb8162efa3272fea535d0f93632b4778d9c80d64fca26740471ed49
+AUX suricata-5.0.1_configure-no-lz4-automagic.patch 601 BLAKE2B 01874b39d89a8872a35a102018e2e11208549f60790e88f988a689ba09c59fb915bbffccb6db454a8d8d4fee0ccf69b51cd5d2cde11cb6f2a1c401cb74c5c49d SHA512 d26fc7e0193ea3ddd5436964a26bbbfed847890d513c4e7181a0faceb0a688df8ca35ad68045ecd006a25da93d345a942c593f8711f81dff5f63d13e599f78b0
+AUX suricata-5.0.1_default-config.patch 813 BLAKE2B 5758447f2dc6fa50bb6a388c2c83bd35927cf90b66a10e51e5058869e09c05810c037da025a9d26486e33077a06bfe8ba08698618e091bdc40a255d8322062c7 SHA512 0f6337d5bff60cd57f3a3a3edcb82abde9acc6848b158cac1b8f945fc7a228340c420d53a2c5f558d5b5e2b7645f6b104e8105b260245209ba782966d6f04a7c
 AUX suricata-logrotate 161 BLAKE2B d55edb7e36cc27819b6fba26778eff3cc66bfc5c04877e36e27ef9adcf3f003c10cff787b317e00a32a4c764c2180f90c9abd3f81e877d73bd2c892d5ca2d161 SHA512 c22a85667460df9b7b1fd15af1e4472dd5b7d1726a43f3b621547a884dcd64ff49b0728767d6a4dc70c413dd8997905e3753fa94c82cda34e4aaf903ebdb1cec
-DIST suricata-4.0.4.tar.gz 12511121 BLAKE2B d9dfb00a45c2e9810409a8ce91a83e23ebce20eb28492bf24f9688d292b5805dca932c39cc673cf1148325fe5ef7936dda7f6c7819605753cb2e2ddc1cf5dba0 SHA512 6e158aa6d3edb9d11e0df3f986392ee2ae49ab4dfb978288ced4484dbe5c08ae061db2a566be6d22cf14bd0b88f87f9cb9c0a657d7fc44e099b8783d933c771e
-EBUILD suricata-4.0.4.ebuild 4771 BLAKE2B f52e9e40f2da2a016122b09d30c34aa2467e1f2a682a5161677501d9a9c479fbf66b995b8ae9d5454e6fe7080f229e4961707fdf6e3e7e5ea133ffb84e5f2d1f SHA512 76ff00070b17bd39d1fb532a0d5f56113e6b30c3d6adb8473f0494b6440b45a967e21a846150cd97b03a99e84fc271a72057a4b2013921a13c2c2cc8b2a65cba
-MISC metadata.xml 775 BLAKE2B faf442e43b5388b3a24b57ee3aa73ea22eb0f230bd7bfbdee98bc4ec0be260f52f47cf7caa67d44d3498cdba58e18c487741a295149c64cf2b4631a141537e8a SHA512 e9407a4c043553a31b1a66c6b45d352444368567eef3bfa4af26e64bb84a70a81bcc7a21e48dba7e532a3115c7086932e22b75a05b00ba1f84b59d4d7ec187c6
+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 6159 BLAKE2B 09a165bbee254f1b7d6b8a5ede8f3514301d58b85291f8336dc02d0c8c3c1ee5b89fdc63837af5bec3bb038ad8d5b919e13976a55af584a2620f6da5da36d492 SHA512 cde3097df89de194d045ea22843b9b4924b69fb7bb8fced588c8d3865cdafb5e14db0e22a065fec743835fa525d836f4ade6d02e4f469e76b81e46d5e5b2f482
+MISC metadata.xml 1015 BLAKE2B 355c550ad2fe7a37d69b92f0bd710824d68a3353be687876449ad5b7d8e2c98b06b833e59ebcf479410aff09dce71e1f7f64be860c348f3d6c3519cd8fe2acf2 SHA512 0837e07a0130baff435e684b47a6b463991aec73b4f570672d0091a70adf163c5e83d19887e1575f12db783d6246050777011d25dc658fe4767cd3fe8fc1d4a5
diff --git a/net-analyzer/suricata/files/suricata-4.0.4_configure-lua-flags.patch b/net-analyzer/suricata/files/suricata-4.0.4_configure-lua-flags.patch
deleted file mode 100644
index bad66359afa1..000000000000
--- a/net-analyzer/suricata/files/suricata-4.0.4_configure-lua-flags.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1749,11 +1749,11 @@
-   # liblua
-     AC_ARG_ENABLE(lua,
- 	        AS_HELP_STRING([--enable-lua],[Enable Lua support]),
--	        [ enable_lua="yes"],
-+	        [],
- 	        [ enable_lua="no"])
-     AC_ARG_ENABLE(luajit,
- 	        AS_HELP_STRING([--enable-luajit],[Enable Luajit support]),
--	        [ enable_luajit="yes"],
-+	        [],
- 	        [ enable_luajit="no"])
-     if test "$enable_lua" = "yes"; then
-         if test "$enable_luajit" = "yes"; then
diff --git a/net-analyzer/suricata/files/suricata-4.0.4_sockios.patch b/net-analyzer/suricata/files/suricata-4.0.4_sockios.patch
deleted file mode 100644
index a341d9c159f1..000000000000
--- a/net-analyzer/suricata/files/suricata-4.0.4_sockios.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/source-af-packet.c.orig	2019-09-08 20:50:06.416466432 +0200
-+++ src/source-af-packet.c	2019-09-08 20:53:26.144471385 +0200
-@@ -70,6 +70,10 @@
- 
- #ifdef HAVE_AF_PACKET
- 
-+#ifdef HAVE_LINUX_SOCKIOS_H
-+#include <linux/sockios.h>
-+#endif
-+
- #if HAVE_SYS_IOCTL_H
- #include <sys/ioctl.h>
- #endif
diff --git a/net-analyzer/suricata/files/suricata-4.0.4-conf b/net-analyzer/suricata/files/suricata-5.0.1-conf
index 655b947fdd9b..7f22113dbf0d 100644
--- a/net-analyzer/suricata/files/suricata-4.0.4-conf
+++ b/net-analyzer/suricata/files/suricata-5.0.1-conf
@@ -37,7 +37,7 @@
 # If you want to use ${SURICATA_DIR}/suricata.yaml and start the service with /etc/init.d/suricata
 # then you can set:
 
-SURICATA_OPTS="-i eth0"
+SURICATA_OPTS="--af-packet"
 
 # Log paths listed here will be created by the init script and will override the log path
 # set in the yaml file, if present.
diff --git a/net-analyzer/suricata/files/suricata-4.0.4-init b/net-analyzer/suricata/files/suricata-5.0.1-init
index 1db8137f31a4..89f92803cedf 100644
--- a/net-analyzer/suricata/files/suricata-4.0.4-init
+++ b/net-analyzer/suricata/files/suricata-5.0.1-init
@@ -9,7 +9,7 @@ SURICATAID=$(shell_var "${SURICATA}")
 if [ -n "${SURICATA}" ] && [ ${SVCNAME} != "suricata" ]; then
     eval SURICATACONF=\$SURICATA_CONF_${SURICATAID}
     [ ${#SURICATACONF} -eq 0 ] && SURICATACONF="${SURICATA_DIR}/suricata-${SURICATA}.yaml" || SURICATACONF="${SURICATA_DIR}/${SURICATACONF}"
-    SURICATAPID="/var/run/suricata/suricata.${SURICATA}.pid"
+    SURICATAPID="/run/suricata/suricata.${SURICATA}.pid"
     eval SURICATAOPTS=\$SURICATA_OPTS_${SURICATAID}
     eval SURICATALOGPATH=\$SURICATA_LOG_FILE_${SURICATAID}
     eval SURICATAUSER=\$SURICATA_USER_${SURICATAID}
@@ -17,7 +17,7 @@ if [ -n "${SURICATA}" ] && [ ${SVCNAME} != "suricata" ]; then
 else
     SURICATACONF=${SURICATA_CONF}
     [ ${#SURICATACONF} -eq 0 ] && SURICATACONF="${SURICATA_DIR}/suricata.yaml" || SURICATACONF="${SURICATA_DIR}/${SURICATACONF}"
-    SURICATAPID="/var/run/suricata/suricata.pid"
+    SURICATAPID="/run/suricata/suricata.pid"
     SURICATAOPTS=${SURICATA_OPTS}
     SURICATALOGPATH=${SURICATA_LOG_FILE}
     SURICATAUSER=${SURICATA_USER}
@@ -43,8 +43,8 @@ depend() {
 }
 
 checkconfig() {
-	if [ ! -d "/var/run/suricata" ] ; then
-		checkpath -d /var/run/suricata
+	if [ ! -d "/run/suricata" ] ; then
+		checkpath -d /run/suricata
 	fi
 	if [ ${#SURICATALOGPATH} -gt 0 ]; then
 		SURICATALOGFILE=$( basename ${SURICATALOGPATH} )
diff --git a/net-analyzer/suricata/files/suricata-5.0.1_configure-no-lz4-automagic.patch b/net-analyzer/suricata/files/suricata-5.0.1_configure-no-lz4-automagic.patch
new file mode 100644
index 000000000000..5efce46f6d9f
--- /dev/null
+++ b/net-analyzer/suricata/files/suricata-5.0.1_configure-no-lz4-automagic.patch
@@ -0,0 +1,23 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -2292,7 +2292,11 @@
+     fi
+ 
+ # Check for lz4
+-enable_liblz4="yes"
++AC_ARG_ENABLE(lz4,
++       AS_HELP_STRING([--enable-lz4], [Enable compressed pcap logging using liblz4]),
++       [enable_liblz4=$enableval],
++       [enable_liblz4=yes])
++if test "x$enable_liblz4" != "xno"; then
+ AC_CHECK_LIB(lz4, LZ4F_createCompressionContext, , enable_liblz4="no")
+ 
+ if test "$enable_liblz4" = "no"; then
+@@ -2306,6 +2310,7 @@
+     echo "               yum install lz4-devel"
+     echo
+ fi
++fi
+ 
+ # get cache line size
+     AC_PATH_PROG(HAVE_GETCONF_CMD, getconf, "no")
diff --git a/net-analyzer/suricata/files/suricata-5.0.1_default-config.patch b/net-analyzer/suricata/files/suricata-5.0.1_default-config.patch
new file mode 100644
index 000000000000..ef1b1f63ad4f
--- /dev/null
+++ b/net-analyzer/suricata/files/suricata-5.0.1_default-config.patch
@@ -0,0 +1,27 @@
+--- a/suricata.yaml.in
++++ b/suricata.yaml.in
+@@ -203,8 +203,9 @@
+             # https://suricata.readthedocs.io/en/latest/output/eve/eve-json-output.html#dns-v1-format
+ 
+             # As of Suricata 5.0, version 2 of the eve dns output
+-            # format is the default.
+-            #version: 2
++            # format is the default - but the daemon produces a warning to that effect
++            # at start-up if this isn't explicitly set.
++            version: 2
+ 
+             # Enable/disable this logger. Default: enabled.
+             #enabled: yes
+@@ -978,9 +979,9 @@
+ ##
+ 
+ # Run suricata as user and group.
+-#run-as:
+-#  user: suri
+-#  group: suri
++run-as:
++  user: suricata
++  group: suricata
+ 
+ # Some logging module will use that name in event as identifier. The default
+ # value is the hostname
diff --git a/net-analyzer/suricata/files/suricata.service b/net-analyzer/suricata/files/suricata.service
new file mode 100644
index 000000000000..1fb056957ec5
--- /dev/null
+++ b/net-analyzer/suricata/files/suricata.service
@@ -0,0 +1,19 @@
+[Unit]
+Description=Suricata IDS/IDP daemon
+After=network.target
+Requires=network.target
+Documentation=man:suricata(8) man:suricatasc(8)
+Documentation=https://suricata.readthedocs.io/
+
+[Service]
+Environment=OPTIONS='-c /etc/suricata/suricata.yaml --af-packet'
+PIDFile=/run/suricata/suricata.pid
+ExecStart=/usr/bin/suricata --pidfile /run/suricata/suricata.pid $OPTIONS
+ExecReload=/bin/kill -HUP $MAINPID
+ExecStop=/bin/kill $MAINPID
+PrivateTmp=yes
+ProtectHome=yes
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/net-analyzer/suricata/files/suricata.tmpfiles b/net-analyzer/suricata/files/suricata.tmpfiles
new file mode 100644
index 000000000000..a6e784cc37c7
--- /dev/null
+++ b/net-analyzer/suricata/files/suricata.tmpfiles
@@ -0,0 +1 @@
+d	/run/suricata	- - - -
diff --git a/net-analyzer/suricata/metadata.xml b/net-analyzer/suricata/metadata.xml
index 0afee5625d1a..457a2fbd2e8a 100644
--- a/net-analyzer/suricata/metadata.xml
+++ b/net-analyzer/suricata/metadata.xml
@@ -2,17 +2,20 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>slis@gentoo.org</email>
+    <email>marecki@gentoo.org</email>
+    <name>Marek Szuba</name>
   </maintainer>
   <use>
     <flag name="af-packet">Enable AF_PACKET support</flag>
+    <flag name="bpf">Enable support for eBPF (as well as XDP if supported by the kernel and the NIC driver)
+        for low-level, high-speed packet processing</flag>
     <flag name="control-socket">Enable unix socket</flag>
     <flag name="cuda">Enable NVIDIA Cuda computations support</flag>
     <flag name="detection">Enable detection modules</flag>
+    <flag name="logrotate">Install logrotate rule</flag>
+    <flag name="lz4">Enable support for compressed pcap logging using the LZ4 algorithm</flag>
     <flag name="nflog">Enable libnetfilter_log support</flag>
     <flag name="nfqueue">Enable NFQUEUE support for inline IDP</flag>
     <flag name="redis">Enable Redis support</flag>
-    <flag name="rules">Install default ruleset</flag>
-    <flag name="logrotate">Install logrotate rule</flag>
   </use>
 </pkgmetadata>
diff --git a/net-analyzer/suricata/suricata-4.0.4.ebuild b/net-analyzer/suricata/suricata-4.0.4.ebuild
deleted file mode 100644
index 2ea320ca46ba..000000000000
--- a/net-analyzer/suricata/suricata-4.0.4.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils user
-
-DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
-HOMEPAGE="https://suricata-ids.org/"
-SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+af-packet control-socket cuda debug +detection geoip hardened logrotate lua luajit nflog +nfqueue redis +rules test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-libs/jansson-2.2
-	dev-libs/libpcre
-	dev-libs/libyaml
-	net-libs/libnet:*
-	net-libs/libnfnetlink
-	dev-libs/nspr
-	dev-libs/nss
-	>=net-libs/libhtp-0.5.20
-	net-libs/libpcap
-	sys-apps/file
-	cuda?       ( dev-util/nvidia-cuda-toolkit )
-	geoip?      ( dev-libs/geoip )
-	lua?        ( dev-lang/lua:* )
-	luajit?     ( dev-lang/luajit:* )
-	nflog?      ( net-libs/libnetfilter_log )
-	nfqueue?    ( net-libs/libnetfilter_queue )
-	redis?      ( dev-libs/hiredis )
-	logrotate?      ( app-admin/logrotate )
-	sys-libs/libcap-ng
-"
-# #446814
-#	prelude?    ( dev-libs/libprelude )
-#	pfring?     ( sys-process/numactl net-libs/pf_ring)
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} "${PN}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}_configure-lua-flags.patch"
-	epatch "${FILESDIR}/${P}_sockios.patch"
-	sed -ie 's/docdir =.*/docdir = ${datarootdir}\/doc\/'${PF}'\//' "${S}/doc/Makefile.am"
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		"--localstatedir=/var/" \
-		"--enable-non-bundled-htp" \
-		$(use_enable af-packet) \
-		$(use_enable detection) \
-		$(use_enable nfqueue) \
-		$(use_enable test coccinelle) \
-		$(use_enable test unittests) \
-		$(use_enable control-socket unix-socket)
-	)
-
-	if use cuda ; then
-		myeconfargs+=( $(use_enable cuda) )
-	fi
-	if use geoip ; then
-		myeconfargs+=( $(use_enable geoip) )
-	fi
-	if use hardened ; then
-		myeconfargs+=( $(use_enable hardened gccprotect) )
-	fi
-	if use nflog ; then
-		myeconfargs+=( $(use_enable nflog) )
-	fi
-	if use redis ; then
-		myeconfargs+=( $(use_enable redis hiredis) )
-	fi
-	# not supported yet (no pfring in portage)
-# 	if use pfring ; then
-# 		myeconfargs+=( $(use_enable pfring) )
-# 	fi
-	# no libprelude in portage
-# 	if use prelude ; theng
-# 		myeconfargs+=( $(use_enable prelude) )
-# 	fi
-	if use lua ; then
-		myeconfargs+=( $(use_enable lua) )
-	fi
-	if use luajit ; then
-		myeconfargs+=( $(use_enable luajit) )
-	fi
-	if (use !lua) && (use !luajit) ; then
-		myeconfargs+=(
-			--disable-lua
-			--disable-luajit
-		)
-	fi
-
-# this should be used when pf_ring use flag support will be added
-# 	LIBS+="-lrt -lnuma"
-
-	# avoid upstream configure script trying to add -march=native to CFLAGS
-	myeconfargs+=( --enable-gccmarch-native=no )
-
-	if use debug ; then
-		myeconfargs+=( $(use_enable debug) )
-		# so we can get a backtrace according to "reporting bugs" on upstream web site
-		CFLAGS="-ggdb -O0" econf LIBS="${LIBS}" ${myeconfargs[@]}
-	else
-		econf LIBS="${LIBS}" ${myeconfargs[@]}
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto "/etc/${PN}"
-	doins {classification,reference,threshold}.config suricata.yaml
-
-	if use rules ; then
-		insinto "/etc/${PN}/rules"
-		doins rules/*.rules
-	fi
-
-	keepdir "/var/lib/${PN}"
-	keepdir "/var/log/${PN}"
-
-	fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
-	fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
-
-	newinitd "${FILESDIR}/${P}-init" ${PN}
-	newconfd "${FILESDIR}/${P}-conf" ${PN}
-
-	if use logrotate; then
-		insopts -m0644
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/${PN}-logrotate ${PN}
-	fi
-}
-
-pkg_postinst() {
-	elog "The ${PN} init script expects to find the path to the configuration"
-	elog "file as well as extra options in /etc/conf.d."
-	elog ""
-	elog "To create more than one ${PN} service, simply create a new .yaml file for it"
-	elog "then create a symlink to the init script from a link called"
-	elog "${PN}.foo - like so"
-	elog "   cd /etc/${PN}"
-	elog "   ${EDITOR##*/} suricata-foo.yaml"
-	elog "   cd /etc/init.d"
-	elog "   ln -s ${PN} ${PN}.foo"
-	elog "Then edit /etc/conf.d/${PN} and make sure you specify sensible options for foo."
-	elog ""
-	elog "You can create as many ${PN}.foo* services as you wish."
-
-	if use logrotate; then
-		elog "You enabled the logrotate USE flag. Please make sure you correctly set up the ${PN} logrotate config file in /etc/logrotate.d/."
-	fi
-
-	if use debug; then
-		elog "You enabled the debug USE flag. Please read this link to report bugs upstream:"
-		elog "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Reporting_Bugs"
-		elog "You need to also ensure the FEATURES variable in make.conf contains the"
-		elog "'nostrip' option to produce useful core dumps or back traces."
-	fi
-}
diff --git a/net-analyzer/suricata/suricata-5.0.1.ebuild b/net-analyzer/suricata/suricata-5.0.1.ebuild
new file mode 100644
index 000000000000..676947405976
--- /dev/null
+++ b/net-analyzer/suricata/suricata-5.0.1.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit autotools linux-info python-single-r1 systemd
+
+DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
+HOMEPAGE="https://suricata-ids.org/"
+SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua luajit lz4 nflog +nfqueue redis systemd test"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	?? ( lua luajit )
+	bpf? ( af-packet )"
+
+CDEPEND="acct-group/suricata
+	acct-user/suricata
+	dev-libs/jansson
+	dev-libs/libpcre
+	dev-libs/libyaml
+	net-libs/libnet:*
+	net-libs/libnfnetlink
+	dev-libs/nspr
+	dev-libs/nss
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=net-libs/libhtp-0.5.32
+	net-libs/libpcap
+	sys-apps/file
+	sys-libs/libcap-ng
+	bpf?        ( >=dev-libs/libbpf-0.0.6 )
+	cuda?       ( dev-util/nvidia-cuda-toolkit )
+	geoip?      ( dev-libs/libmaxminddb )
+	logrotate?  ( app-admin/logrotate )
+	lua?        ( dev-lang/lua:* )
+	luajit?     ( dev-lang/luajit:* )
+	lz4?        ( app-arch/lz4 )
+	nflog?      ( net-libs/libnetfilter_log )
+	nfqueue?    ( net-libs/libnetfilter_queue )
+	redis?      ( dev-libs/hiredis )"
+DEPEND="${CDEPEND}
+	>=sys-devel/autoconf-2.69-r5
+	virtual/rust"
+RDEPEND="${CDEPEND}
+	${PYTHON_DEPS}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.0.1_configure-no-lz4-automagic.patch"
+	"${FILESDIR}/${PN}-5.0.1_default-config.patch"
+)
+
+pkg_pretend() {
+	if use bpf && use kernel_linux; then
+		if kernel_is -lt 4 15; then
+			ewarn "Kernel 4.15 or newer is necessary to use all XDP features like the CPU redirect map"
+		fi
+
+		CONFIG_CHECK="~XDP_SOCKETS"
+		ERROR_XDP_SOCKETS="CONFIG_XDP_SOCKETS is not set, making it impossible for Suricata will to load XDP programs. "
+		ERROR_XDP_SOCKETS+="Other eBPF features should work normally."
+		check_extra_config
+	fi
+}
+
+src_prepare() {
+	default
+	sed -ie 's/docdir =.*/docdir = ${datarootdir}\/doc\/'${PF}'\//' "${S}/doc/Makefile.am"
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		"--localstatedir=/var" \
+		"--runstatedir=/run" \
+		"--enable-non-bundled-htp" \
+		"--enable-gccmarch-native=no" \
+		"--enable-python" \
+		$(use_enable af-packet) \
+		$(use_enable bpf ebpf) \
+		$(use_enable control-socket unix-socket) \
+		$(use_enable cuda) \
+		$(use_enable detection) \
+		$(use_enable geoip) \
+		$(use_enable hardened gccprotect) \
+		$(use_enable hardened pie) \
+		$(use_enable lua) \
+		$(use_enable luajit) \
+		$(use_enable lz4) \
+		$(use_enable nflog) \
+		$(use_enable nfqueue) \
+		$(use_enable redis hiredis) \
+		$(use_enable test unittests) \
+		"--disable-coccinelle"
+	)
+
+	if use debug; then
+		myeconfargs+=( $(use_enable debug) )
+		# so we can get a backtrace according to "reporting bugs" on upstream web site
+		CFLAGS="-ggdb -O0" econf ${myeconfargs[@]}
+	else
+		econf ${myeconfargs[@]}
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	python_optimize
+
+	if use bpf; then
+		rm -f ebpf/Makefile.{am,in}
+		dodoc -r ebpf/
+		keepdir /usr/libexec/suricata/ebpf
+	fi
+
+	insinto "/etc/${PN}"
+	doins etc/{classification,reference}.config threshold.config suricata.yaml
+
+	keepdir "/var/lib/${PN}/rules" "/var/lib/${PN}/update"
+	keepdir "/var/log/${PN}"
+
+	fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
+	fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
+	fperms 2750 "/var/lib/${PN}/rules" "/var/lib/${PN}/update"
+
+	newinitd "${FILESDIR}/${PN}-5.0.1-init" ${PN}
+	newconfd "${FILESDIR}/${PN}-5.0.1-conf" ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
+
+	if use logrotate; then
+		insopts -m0644
+		insinto /etc/logrotate.d
+		newins etc/${PN}.logrotate ${PN}
+	fi
+}
+
+pkg_postinst() {
+	elog ""
+	if use systemd; then
+		elog "Suricata requires either the mode of operation (e.g. --af-packet) or the interface to listen on (e.g. -i eth0)"
+		elog "to be specified on the command line. The provided systemd unit launches Suricata in af-packet mode and relies"
+		elog "on file configuration to specify interfaces, should you prefer to run it differently you will have to customise"
+		elog "said unit. The simplest way of doing it is to override the Environment=OPTIONS='...' line using a .conf file"
+		elog "placed in the directory ${EPREFIX}/etc/systemd/system/suricata.service.d/ ."
+		elog "For details, see the section on drop-in directories in systemd.unit(5)."
+	else
+		elog "The ${PN} init script expects to find the path to the configuration"
+		elog "file as well as extra options in /etc/conf.d."
+		elog ""
+		elog "To create more than one ${PN} service, simply create a new .yaml file for it"
+		elog "then create a symlink to the init script from a link called"
+		elog "${PN}.foo - like so"
+		elog "   cd /etc/${PN}"
+		elog "   ${EDITOR##*/} suricata-foo.yaml"
+		elog "   cd /etc/init.d"
+		elog "   ln -s ${PN} ${PN}.foo"
+		elog "Then edit /etc/conf.d/${PN} and make sure you specify sensible options for foo."
+		elog ""
+		elog "You can create as many ${PN}.foo* services as you wish."
+	fi
+
+	if use bpf; then
+		elog ""
+		elog "eBPF/XDP files must be compiled (using sys-devel/clang[llvm_targets_BPF]) before use"
+		elog "because their configuration is hard-coded. You can find the default ones in"
+		elog "    ${EPREFIX}/usr/share/doc/${PF}/ebpf"
+		elog "and the common location for eBPF bytecode is"
+		elog "    ${EPREFIX}/usr/libexec/${PN}"
+		elog "For more information, see https://${PN}.readthedocs.io/en/${P}/capture-hardware/ebpf-xdp.html"
+	fi
+
+	if use debug; then
+		elog ""
+		elog "You have enabled the debug USE flag. Please read this link to report bugs upstream:"
+		elog "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Reporting_Bugs"
+		elog "You need to also ensure the FEATURES variable in make.conf contains the"
+		elog "'nostrip' option to produce useful core dumps or back traces."
+	fi
+
+	elog ""
+	elog "To download and install an initial set of rules, run:"
+	elog "    emerge --config =${CATEGORY}/${PF}"
+	elog ""
+}
+
+pkg_config() {
+	suricata-update
+}
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index ea9735b41903..649e56a42519 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -1,4 +1,6 @@
+AUX tcpdump-9999-libdir.patch 505 BLAKE2B 903bbbd4d860053168c92a3bf2ef76bf8ab32a45da05d0b47894368d39d2c8432f68ff47740d30c34868a60e6e300e08a1a1b5b8e17bb9519c945e39f81014a6 SHA512 eb12b115c8c6f0a2b7bb84712fe3dda5ddde3e6acb56d00000e97abc007b26a1411ddf6be793205bf7c76ccecc3915c417124870326745e3896ae6963bb42341
 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 1972 BLAKE2B 212f414d858a2b428777373768e08d51bb3d57be9a8d3434bc84b96975dfaeccd527af5d12aae8151a5ef162f429fd9830b3e069c65226eefe88cf04a1de0146 SHA512 f4c2e94bdad0b57fa985b836c59ab02ad86b04b67a1bfac68d08a673dbabfd9272054af6d46e9f823f5aaf0fd4da8435f21ad15b2bd0ca67e15a34f60a8f62f9
-EBUILD tcpdump-9999.ebuild 2218 BLAKE2B 049cdbd3abe9ad3d425f0825b15103d0054dead44e5740401744dec360b053710a74b4ac3579ca0f3cfce32dd5298e7934fc78b4e7d30455fb685973012a16bc SHA512 94a8dacb7b1b93cb30f1b7976634628829e26fd9d68173bc7d597c51710b281afd7bdeffcab63478ea39caaea67c104b25b6df788d13d07b2984469718ac3d03
+EBUILD tcpdump-9999.ebuild 2243 BLAKE2B 2e86614481c991ecf8e087bfcdce3bf22f203589456a7279c38446d321efbd10bf3912845d0334175a296b762154d12ad510ce5b94c3facdf9778823e26e9cee SHA512 2a7dbdfdbb19b19e1f3d30da1f843a070a1d19f929a6509a99d843ebc8fd5c644cbb58f37b93c72e8ad8937938fddd1a893dfd3df526b5a1d0ad49a531746eb1
 MISC metadata.xml 639 BLAKE2B 2bbc5e38a9e172b7aa6dc69d211311d263007bb0da6e268cb9de953f0f862de3562b12e2ba3be267963ed2ef78254e7622951ab997550d78eb56fb057621e3ab SHA512 b765372f84fc597e257acf7d7e7daa5d9b220831ceb041851a9ef08da0fd419f36b12244cae9da0c3ef2b1b5c3fae9e4d234818ab4d58caf209c2c22604de392
diff --git a/net-analyzer/tcpdump/files/tcpdump-9999-libdir.patch b/net-analyzer/tcpdump/files/tcpdump-9999-libdir.patch
new file mode 100644
index 000000000000..852ea6b6c132
--- /dev/null
+++ b/net-analyzer/tcpdump/files/tcpdump-9999-libdir.patch
@@ -0,0 +1,19 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -371,7 +371,7 @@
+ 
+ if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then
+ 	if test -d $ipv6libdir -a -f $ipv6libdir/lib$ipv6lib.a; then
+-		LIBS="-L$ipv6libdir -l$ipv6lib $LIBS"
++		LIBS="-l$ipv6lib $LIBS"
+ 		echo "You have $ipv6lib library, using it"
+ 	else
+ 		if test "$ipv6trylibc" = "yes"; then
+@@ -891,7 +891,6 @@
+ 		# at the front of the header and library search path.
+ 		#
+ 		CFLAGS="-I$withval/include $CFLAGS"
+-		LIBS="-L$withval/lib $LIBS"
+ 	fi
+ ],[
+ 	#
diff --git a/net-analyzer/tcpdump/tcpdump-4.9.3-r1.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.3-r1.ebuild
new file mode 100644
index 000000000000..2fc6154ef964
--- /dev/null
+++ b/net-analyzer/tcpdump/tcpdump-4.9.3-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic toolchain-funcs user
+
+DESCRIPTION="A Tool for network monitoring and data acquisition"
+HOMEPAGE="
+	https://www.tcpdump.org/
+	https://github.com/the-tcpdump-group/tcpdump
+"
+SRC_URI="
+	https://www.tcpdump.org/release/${P}.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+drop-root libressl smi ssl samba suid test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	drop-root? ( sys-libs/libcap-ng )
+	net-libs/libpcap
+	smi? ( net-libs/libsmi )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.6m:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="
+	${RDEPEND}
+	drop-root? ( virtual/pkgconfig )
+	test? (
+		>=net-libs/libpcap-1.9.1
+		dev-lang/perl
+	)
+"
+
+pkg_setup() {
+	if use drop-root || use suid; then
+		enewgroup tcpdump
+		enewuser tcpdump -1 -1 -1 tcpdump
+	fi
+}
+
+src_configure() {
+	if use drop-root; then
+		append-cppflags -DHAVE_CAP_NG_H
+		export LIBS=$( $(tc-getPKG_CONFIG) --libs libcap-ng )
+	fi
+
+	econf \
+		$(use_enable samba smb) \
+		$(use_with drop-root chroot '') \
+		$(use_with smi) \
+		$(use_with ssl crypto "${ESYSROOT}/usr") \
+		$(usex drop-root "--with-user=tcpdump" "")
+}
+
+src_test() {
+	if [[ ${EUID} -ne 0 ]] || ! use drop-root; then
+		emake check
+	else
+		ewarn "If you want to run the test suite, make sure you either"
+		ewarn "set FEATURES=userpriv or set USE=-drop-root"
+	fi
+}
+
+src_install() {
+	dosbin tcpdump
+	doman tcpdump.1
+	dodoc *.awk
+	dodoc CHANGES CREDITS README.md
+
+	if use suid; then
+		fowners root:tcpdump /usr/sbin/tcpdump
+		fperms 4110 /usr/sbin/tcpdump
+	fi
+}
+
+pkg_preinst() {
+	if use drop-root || use suid; then
+		enewgroup tcpdump
+		enewuser tcpdump -1 -1 -1 tcpdump
+	fi
+}
+
+pkg_postinst() {
+	use suid && elog "To let normal users run tcpdump add them into tcpdump group."
+}
diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild
index 52faf660b30f..53e77a2204b0 100644
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-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
@@ -36,10 +36,13 @@ DEPEND="
 	${RDEPEND}
 	drop-root? ( virtual/pkgconfig )
 	test? (
-		|| ( app-arch/sharutils sys-freebsd/freebsd-ubin )
+		>=net-libs/libpcap-1.9.1
 		dev-lang/perl
 	)
 "
+PATCHES=(
+	"${FILESDIR}"/${PN}-9999-libdir.patch
+)
 
 pkg_setup() {
 	if use drop-root || use suid; then
diff --git a/net-analyzer/tcpslice/Manifest b/net-analyzer/tcpslice/Manifest
index 882186d22781..40aa5b6219fa 100644
--- a/net-analyzer/tcpslice/Manifest
+++ b/net-analyzer/tcpslice/Manifest
@@ -2,4 +2,5 @@ AUX tcpslice-1.2a_p3-exit.patch 148 BLAKE2B 630ab0a2f57eda36d148c9338bc1a6b95feb
 DIST tcpslice_1.2a3-4.debian.tar.gz 5784 BLAKE2B c85beab03b494984d721ca64fb75ccb29746dee4184e4daecf2703e80f3b3d3e4330b911831960caa17d631a4760a21d17368cd7017e61c05766fd1f50c66e0e SHA512 43a0ad5811c84639be0c6d162ea92101e73240e9689e4b647ee060697382062ec0e22dcb951ca000e05bac829455b7aa37f8dd73c5b1dd87f55e6d61a8a9b59b
 DIST tcpslice_1.2a3.orig.tar.gz 76879 BLAKE2B 38b20ef09c2c0fc2c956c421d131ce27748bea684bb459da13f0d29b008a4561b7f61381cfbdb9c1dbdf53478c55b412efa9af689d5425f7fbfc9f0ee32016d5 SHA512 04e12d592807022c78eb4941580ed103995680c69af885bb8f13828a12ec570f7fe93c34c1b20a01d3d99f445d5da17a1fcfbe25b2e3b41abe28304c034654c5
 EBUILD tcpslice-1.2a_p3-r1.ebuild 736 BLAKE2B 6a2fd4f929bb656cb9d232795cb2858e9dc459960cb4c656b3eb5aec86d2b4e35b6363d4632f9b9af7118ebd2bca6a2caf84c3f3ea7cf0a5608191a8debb195a SHA512 8b7844ca28b934c922927da7a91751672d592f4332be1574d18c2818c0def15cf72aed435240ded7699690786f979f5a449cad69c1297bfc7e9d69b185eb7221
+EBUILD tcpslice-1.2a_p3_p4.ebuild 868 BLAKE2B af956b365f5677d212f0bc4a43fab5fb4a061a7efb811c42678b6250b3debf37cf1f18640d82fc1202bf72f3fdd0503ce62052d8426eea82841452dd18a7c375 SHA512 4d5ca1c8a3f5097fe85f68519daabb1b80bf512f9eb33f2c613d80470b8da575092b211d747be4830b3cb0110ccf0d8842c36e2d99ee9dee49d3718de6b00172
 MISC metadata.xml 371 BLAKE2B 072028b30fa16126531152222e9589f8ab1060c71124d1f582edd44b3ee3bd28a051a7115237e0dc05fba064b1a1755459736b296523b5d5472b7d1468408053 SHA512 3bd72b08f16ee7ae7c8fb8787de22923118d3a6b311328f4d7819003455312cf47002f9e41c00f68bf8c88f9e6d74abc4d1f8d24fb5ea41c038e4c46cf8b8bfa
diff --git a/net-analyzer/tcpslice/tcpslice-1.2a_p3_p4.ebuild b/net-analyzer/tcpslice/tcpslice-1.2a_p3_p4.ebuild
new file mode 100644
index 000000000000..c348b112eb35
--- /dev/null
+++ b/net-analyzer/tcpslice/tcpslice-1.2a_p3_p4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic
+
+MY_P="${PN}_$(ver_cut 1).$(ver_cut 2-3)$(ver_cut 5)"
+
+DESCRIPTION="Extract and concatenate portions of pcap files"
+HOMEPAGE="http://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpslice"
+LICENSE="BSD"
+SLOT="0"
+SRC_URI="
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${MY_P}.orig.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${MY_P}-$(ver_cut 7).debian.tar.gz
+"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	net-libs/libpcap
+"
+DEPEND="
+	${RDEPEND}
+"
+S=${WORKDIR}/${MY_P/_/-}
+
+src_prepare() {
+	eapply \
+		"${WORKDIR}"/debian/patches/[0-]* \
+		"${FILESDIR}"/${PN}-1.2a_p3-exit.patch
+	eapply_user
+	sed -i -e 's|ifndef lint|if 0|g' *.c || die
+	eautoconf
+}
+
+src_install() {
+	dosbin tcpslice
+	doman tcpslice.1
+	dodoc README
+}
diff --git a/net-analyzer/tcpstat/Manifest b/net-analyzer/tcpstat/Manifest
index 85886c991b06..c2fdd612d431 100644
--- a/net-analyzer/tcpstat/Manifest
+++ b/net-analyzer/tcpstat/Manifest
@@ -1,5 +1,12 @@
 AUX tcpstat-1.5-_DEFAULT_SOURCE.patch 428 BLAKE2B ee4ac925f6baa2728cdc5ec2d31fe9ddfa555465f3386ff0413a851541c06d160270f56896c715c136849776b7233482a0de359c616e73ed4be0755ed05da199 SHA512 471309ad08b0a10f18b34a3d69a81ff19223787f375ea652fb12a96b3166432a55efb091d255aee4388262e44af0d4b3ea2a644ddc6cfaf8201b57194511a1d9
 AUX tcpstat-1.5-db.patch 4691 BLAKE2B 1c135688c7197144f6add6ccca007a70141033a16a6b3c24cf4d9769f43b651fc5cfc2bad875c010d7b888e5533af49aca7eab2c691bb716e2c389435136ab0d SHA512 03de51e86bd0aa1bf2d29097871fe8409498050100c4adefde7d8aae7bdd752455af6ce13b490f4e596ea90557b37c95b974705cbaece35d9b465571fdb31d6d
+AUX tcpstat-1.5_p8-_DEFAULT_SOURCE.patch 510 BLAKE2B 37197b4cbd2c957ad06f8f9813675678b1105e5e63664885dc8346ab96a07e3ca55485a472ea7b6c027518be031669ead178c438bb315ae813e47e7d982f4c46 SHA512 36f92f585e044695eaec96c557bcdd42be170d8d2827c31ff1d310931a7f7aaabe8cf0495ce70b110534872d155af9b9934106ac001bac16662cea8c74e257f4
+AUX tcpstat-1.5_p8-ipv6.patch 1031 BLAKE2B 140174a7dc761c1a9c3183919fd3594e61f866282ccbef95840adeba9dab062d73652335761c13183f9df291b854cae2801001ed32be7571c9f744176bbe90a4 SHA512 65bd5be8498317c7a778d56582d716433ae1eeabbccb0ae6b5deab7de067927db23e4cce0115bf7ece5e410851cd9d74c9523a1ec802bcea4cd7933bc9121095
+AUX tcpstat-1.5_p8-libpcap.patch 191 BLAKE2B 2bc5d3cb2abf84459e4eb0869ff41b295415c9075b69faa97c27eb604658dd9ff8a7a8f8b0f8515cb26f3554672bd3222a8cce0a4538dbd3e1931df6506d07a8 SHA512 e94799b018178c92541e33afaf297fe60039344392fe2629bc82af691df5c14f3e629e2728d87f323ccb191a1dd7d0d501967d73f0d2142e20b4d13bc93467df
+AUX tcpstat-1.5_p8-off-by-one.patch 1299 BLAKE2B 651fddce0312ecf6c7c6d55f1bf7d6504f76c1df0dd4f3386dd2e9a9075a60524ba74d46f531bb0916451ef9b37a1b31cb71eb95e75821d8f95ba9028d203e98 SHA512 85aaf4d129e2c5afdbdc4eead9cbda3fc54c91923500df5a3cd1ca692ef3c7f3862f60dc30f3809104237c0ec349bab12eb7e8db742aca83479c47bceaca7bfb
+AUX tcpstat-1.5_p8-unused.patch 2731 BLAKE2B d1d120953a68cd5fa1dddaf3b6521c953fcf3772fd5d52cafca2fbbceffa0c1245a4e882b6cad17464ecc003642efd54fe00413eade52cf16adc1985c0c0431a SHA512 5c9a058dc299b04e8cd7b875643200efbcdfa99cfbd33b5527bf4b0960cdeb44767bd3da3df91c4ba8b4ec9dcbd1d5a313c880c7d32ed5ded9201432ff871c09
 DIST tcpstat-1.5.tar.gz 93102 BLAKE2B 39a570fe6176fda0e8a6539417ece268183a1ebed6fa956b8ec5556b8bbd2508829e7d0861ef39b551bd6070df70cfdaf3dbf694a42ad00be4ea0f3e5c757ce5 SHA512 f1399365e754e4d9e19657c455a580294a7b4002a0d02ff05791a45574dcb1d0e75dc492157ef595066502b1553702481c67b20ad24267a50d7293766c39a5ab
-EBUILD tcpstat-1.5-r3.ebuild 855 BLAKE2B 330c2133eabd9397e71e7cdc2bb81525c4021883597abca48344e66b70652d2988ade3ad476a856c11f7971ef443bf4732f0e89910dbbd7764ef55087e55569f SHA512 1d1564553cddcfd07aa05e11f15be0dc9b07a7754024626f5429330ee9ca2d812721e9d7b666bdba5567fa13dacee1cda1e4cebf491dc35340f8c9f4b0622634
+DIST tcpstat_1.5-8.debian.tar.xz 7844 BLAKE2B d74e3fd6a274d5e4e0963741bcfe870cfa300281706f965ac1c61ab7e6eb9aa2ea06566649fb3ae8d6071464cfa4bc037e58f64bf32f71ad8b3006976a515417 SHA512 f54546a9191feddc5410c7abb6764533ce89de4bd93fdc480e1a8f7473b405ca914482e6b950ead39d78d235caf093aaa663c683df346417070b97fc3e4f5c41
+EBUILD tcpstat-1.5-r3.ebuild 885 BLAKE2B 35118eac1848752b7df5ad245b938d5194a31e29392ea23569d0097c4b1233ca17c46b1fa85f1f08b8a2ca88ea502a4a79dd3ee4bd450360768f9da865fcd260 SHA512 d4d010e9564ae72d50776b6a7e3fc7d618e7c198efebdf66a8f36c07cd1b9e055ff7dca0452132863cd9b752cdf1be7d1e12a68f0049b59c8de826836f7470d3
+EBUILD tcpstat-1.5_p8.ebuild 1271 BLAKE2B 968e4940b1cceb0d22f04eda3bb18ceac3147ae87963120a6e92bc72febb4a79207052804617733c4157474a82bf2eee7056adda9de72523f16a8ff68541d848 SHA512 21c914fc0ff09e5039858f58fb57baa23bdf6443155c44e4fcc256b91e0909fd141605063e5449f76698ceb2d1327a2f87932983618abd3902b42945755f6ba0
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/tcpstat/files/tcpstat-1.5_p8-_DEFAULT_SOURCE.patch b/net-analyzer/tcpstat/files/tcpstat-1.5_p8-_DEFAULT_SOURCE.patch
new file mode 100644
index 000000000000..3ea38d7bac02
--- /dev/null
+++ b/net-analyzer/tcpstat/files/tcpstat-1.5_p8-_DEFAULT_SOURCE.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -68,7 +68,7 @@
+ case $my_build_os in
+ 	aix*)		AC_DEFINE(AIX_STRANGENESS, 1, [ defined on AIX systems. ]) ;;
+ 	osf1*)		AC_DEFINE(TRU64_STRANGENESS, 1, [ defined on OSF systems. ]) ;;
+-	linux*)		AC_DEFINE(_BSD_SOURCE, 1, [ defined usually on linux systems ] ) ;;
++	linux*)		AC_DEFINE(_DEFAULT_SOURCE, 1, [ defined usually on linux systems ] ) ;;
+ 	gnu/kfreebsd*)		AC_DEFINE(_BSD_SOURCE, 1, [ defined usually on debian kfreebsd systems ] ) ;;
+ 	bsd/os*)	;;
+ 	freebsd*)	;;
diff --git a/net-analyzer/tcpstat/files/tcpstat-1.5_p8-ipv6.patch b/net-analyzer/tcpstat/files/tcpstat-1.5_p8-ipv6.patch
new file mode 100644
index 000000000000..f26268f7a93f
--- /dev/null
+++ b/net-analyzer/tcpstat/files/tcpstat-1.5_p8-ipv6.patch
@@ -0,0 +1,30 @@
+--- a/configure.in
++++ b/configure.in
+@@ -84,15 +84,26 @@
+ dnl #######################
+ dnl Checks for header files
+ dnl #######################
+ AC_HEADER_STDC
+ AC_HEADER_SYS_WAIT
+-AC_CHECK_HEADERS(sys/time.h sys/stat.h unistd.h strings.h fcntl.h netinet/ip6.h)
++AC_CHECK_HEADERS(sys/time.h sys/stat.h unistd.h strings.h fcntl.h)
+ 
+ dnl BSD/OS Seems to not have a good ethernet header, so we gotta wing it
+ AC_CHECK_HEADERS(net/if.h net/ethernet.h netinet/if_ether.h net/ppp_defs.h)
+ 
++AC_ARG_ENABLE( ipv6, [ AC_HELP_STRING([--enable-ipv6], [s use IPv6?]) ], ip6=$enableval )
++if test "$ip6" = "yes"
++then
++	AC_CHECK_HEADER(netinet/ip6.h, , [AC_MSG_ERROR([I couldn't find netinet/ip6.h though you asked for ipv6 support.])] )
++elif test "$ip6" != "no"
++then
++	AC_CHECK_HEADER(netinet/ip6.h)
++
++fi
++
++
+ dnl #############################################################
+ dnl Checks for typedefs, structures, and compiler characteristics
+ dnl #############################################################
+ AC_C_CONST
+ AC_TYPE_SIZE_T
diff --git a/net-analyzer/tcpstat/files/tcpstat-1.5_p8-libpcap.patch b/net-analyzer/tcpstat/files/tcpstat-1.5_p8-libpcap.patch
new file mode 100644
index 000000000000..54554890416a
--- /dev/null
+++ b/net-analyzer/tcpstat/files/tcpstat-1.5_p8-libpcap.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -47,7 +47,7 @@
+     fi
+   done
+ else
+-  LDFLAGS=" -L${with_pcap_lib} "${LDFLAGS}
++  LDFLAGS="${with_pcap_lib} "${LDFLAGS}
+ fi
+ 
+ AC_ARG_ENABLE(fdesc,
diff --git a/net-analyzer/tcpstat/files/tcpstat-1.5_p8-off-by-one.patch b/net-analyzer/tcpstat/files/tcpstat-1.5_p8-off-by-one.patch
new file mode 100644
index 000000000000..4029ddb7d407
--- /dev/null
+++ b/net-analyzer/tcpstat/files/tcpstat-1.5_p8-off-by-one.patch
@@ -0,0 +1,50 @@
+--- a/src/catpcap.c
++++ b/src/catpcap.c
+@@ -156,10 +156,10 @@
+ 				return Usage(1, argv[0]);
+ 				break;
+ 			case 'f':
+-				strncpy(filterexpr, optarg, BUF_SIZ);
++				strncpy(filterexpr, optarg, BUF_SIZ - 1);
+ 				break;
+ 			case 'r':
+-				strncpy(filename, optarg, BUF_SIZ);
++				strncpy(filename, optarg, BUF_SIZ - 1);
+ 				break;
+ 			default:
+ 				return Usage(1, argv[0]);
+--- a/src/dump.c
++++ b/src/dump.c
+@@ -109,10 +109,10 @@
+ 				get_tcp_flags |= GET_TCPD_COUNT_LINKSIZE;
+ 				break;
+ 			case 'f':
+-				strncpy(filterexpr, optarg, BUF_SIZ);
++				strncpy(filterexpr, optarg, BUF_SIZ - 1);
+ 				break;
+ 			case 'r':
+-				strncpy(filename, optarg, BUF_SIZ);
++				strncpy(filename, optarg, BUF_SIZ - 1);
+ 				break;
+ 			case 's':
+ 				what_to_show |= parse_show_types(optarg);
+--- a/src/tcpprof.c
++++ b/src/tcpprof.c
+@@ -126,14 +126,14 @@
+ 				src_dest_split = 1;
+ 				break;
+ 			case 'f':
+-				strncpy(filterexpr, optarg, BUF_SIZ);
++				strncpy(filterexpr, optarg, BUF_SIZ - 1);
+ 				break;
+ 			case 'i':
+-				strncpy(filename, optarg, BUF_SIZ);
++				strncpy(filename, optarg, BUF_SIZ - 1);
+ 				flags |= GET_TCPD_DO_LIVE;
+ 				break;
+ 			case 'r':
+-				strncpy(filename, optarg, BUF_SIZ);
++				strncpy(filename, optarg, BUF_SIZ - 1);
+ 				flags &= ~GET_TCPD_DO_LIVE;
+ 				break;
+ 			case 'n':
diff --git a/net-analyzer/tcpstat/files/tcpstat-1.5_p8-unused.patch b/net-analyzer/tcpstat/files/tcpstat-1.5_p8-unused.patch
new file mode 100644
index 000000000000..c255f52dbe85
--- /dev/null
+++ b/net-analyzer/tcpstat/files/tcpstat-1.5_p8-unused.patch
@@ -0,0 +1,99 @@
+--- a/lib/process.c
++++ b/lib/process.c
+@@ -230,12 +230,12 @@
+  *   calls a user function pointing to the data
+  *
+  * XXX: filter is not used.  capture_seconds also isn't, but snoop is
+  *	always read from a file.
+  */
+-int get_snoop_data(char *fname, char *filter, int flags,
+-	Double capture_seconds, void (*hook)(packet_data *, void **),
++int get_snoop_data(char *fname,  char *filter __attribute__((unused)), int flags,
++	Double capture_seconds __attribute__((unused)), void (*hook)(packet_data *, void **),
+ 	void **args) {
+ 
+ 	u_char *packet;
+ 	int fd, len, blen, ret = 0;
+ 	struct snoop_file_header	fh;
+--- a/lib/tcpseq.c
++++ b/lib/tcpseq.c
+@@ -54,11 +54,10 @@
+ 	u_char	flags;
+ 	struct tcpseq_ha test_ha;
+ 	struct tcphdr *tp = NULL;
+ 	struct ip *ip;
+ #ifdef INET6
+-	int is_ip6 = 0;
+ 	struct ip6_hdr *ip6;
+ 
+ 	ip6 = (struct ip6_hdr *) &pd->data.ip6.hdr;
+ 	if (is_ip6_packet(pd))
+ 		tp= &(pd->data.ip6.body.tcphdr);
+--- a/src/catpcap.c
++++ b/src/catpcap.c
+@@ -52,13 +52,12 @@
+ 	return '.';
+ }
+ 
+-void proc_pcap(u_char *user, const struct pcap_pkthdr *h, const u_char *p) {
++void proc_pcap(u_char *user __attribute__((unused)), const struct pcap_pkthdr *h, const u_char *p) {
+ 	u_int length = h->caplen, i, j, k, step;
+-	u_char *r, *s;
++	u_char *r;
+ 	char c;
+ 
+ 	r = (u_char *)p;
+-	s = (u_char *)p;
+ 	step = 22;
+ 	printf("%u: %lu.%.6lu, caplen %u, len %u\n",
+ 		p_number++,
+@@ -92,7 +91,7 @@
+  * process_file() takes the output of tcpdump, saves packets, and displays
+  * statistics
+  */
+-void process_file(char *fname, u_int unused) {
++void process_file(char *fname, u_int unused __attribute__((unused))) {
+ 	int run = 1, i;
+ 	pcap_t	*pd;
+ 	char	ebuf[PCAP_ERRBUF_SIZE];
+--- a/src/dump.c
++++ b/src/dump.c
+@@ -37,21 +37,21 @@
+ char filterexpr[BUF_SIZ]	= "";
+ int	get_tcp_flags		= 0;
+ int	what_to_show		= 0;
+ int	packet_number		= 0;
+ 
+-void my_hook(packet_data *pd, void **args) {
++void my_hook(packet_data *pd) {
+ 	printf("PACKET NUMBER: %d\n", ++packet_number);
+ 	print_packet(pd, what_to_show);
+ 	printf("-------------------\n");
+ }
+ 
+ /*
+  * process_file() takes the output of tcpdump, saves packets, and displays
+  * statistics
+  */
+-void process_file(char *fname, u_int unused) {
++void process_file(char *fname, u_int unused __attribute__((unused))) {
+         get_dump_data(fname, filterexpr, get_tcp_flags,
+ 		-1.0, my_hook, NULL);
+ }
+ 
+ int parse_show_types(char *in) {
+--- a/src/tcpstat.c
++++ b/src/tcpstat.c
+@@ -421,11 +421,11 @@
+ }
+ 
+ /*
+  * process_file() gets the data, and then displays the statistics
+  */
+-void process_file(char *fname, u_int unused) {
++void process_file(char *fname, u_int unused __attribute__((unused))) {
+ 	void		*argv[2];
+ 	statistics	stats;
+ 	Double		x;
+ 
+ 	signal(SIGUSR1, catch_signal);
diff --git a/net-analyzer/tcpstat/tcpstat-1.5-r3.ebuild b/net-analyzer/tcpstat/tcpstat-1.5-r3.ebuild
index 422bd5d082da..203f75b73a01 100644
--- a/net-analyzer/tcpstat/tcpstat-1.5-r3.ebuild
+++ b/net-analyzer/tcpstat/tcpstat-1.5-r3.ebuild
@@ -6,7 +6,7 @@ inherit autotools flag-o-matic
 
 DESCRIPTION="Reports network interface statistics"
 HOMEPAGE="https://www.frenchfries.net/paul/tcpstat/"
-SRC_URI="${HOMEPAGE}${P}.tar.gz"
+SRC_URI="https://www.frenchfries.net/paul/tcpstat/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild b/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild
new file mode 100644
index 000000000000..017454e4ac7d
--- /dev/null
+++ b/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic
+
+DESCRIPTION="Reports network interface statistics"
+HOMEPAGE="https://www.frenchfries.net/paul/tcpstat/"
+SRC_URI="
+	https://www.frenchfries.net/paul/tcpstat/${P/_p*}.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-$(ver_cut 4).debian.tar.xz
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6"
+
+DEPEND="
+	net-libs/libpcap
+	sys-libs/db:*
+"
+RDEPEND="
+	${DEPEND}
+"
+DOCS=( AUTHORS ChangeLog NEWS README doc/Tips_and_Tricks.txt )
+PATCHES=(
+	"${FILESDIR}"/${P}-_DEFAULT_SOURCE.patch
+	"${FILESDIR}"/${P}-ipv6.patch
+	"${FILESDIR}"/${P}-libpcap.patch
+	"${FILESDIR}"/${P}-off-by-one.patch
+	"${FILESDIR}"/${P}-unused.patch
+)
+S=${WORKDIR}/${P/_p*}
+
+src_prepare() {
+	eapply $(
+		for patch in $(cat "${WORKDIR}"/debian/patches/series)
+			do echo "${WORKDIR}"/debian/patches/${patch}
+		done
+		) ${PATCHES[@]}
+	eapply_user
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cflags -Wall -Wextra
+	econf \
+		$(use_enable ipv6) \
+		--with-pcap-include='' \
+		--with-pcap-lib="$( $(tc-getPKG_CONFIG) --libs libpcap)"
+}
+
+src_install() {
+	default
+	dobin src/{catpcap,packetdump}
+	newdoc src/README README.src
+}
diff --git a/net-analyzer/wapiti/Manifest b/net-analyzer/wapiti/Manifest
index 7f87e0158d49..f286de32b8e7 100644
--- a/net-analyzer/wapiti/Manifest
+++ b/net-analyzer/wapiti/Manifest
@@ -1,4 +1,4 @@
 DIST wapiti3-3.0.2.tar.gz 561658 BLAKE2B f013b7d3c23cc3b655503de9f14d53b24d281604344c558791561c900fbe8b1a591c6b56970b41c961b38f65680799bf254887f4613d8e2bc96ddbc0a6aa7c24 SHA512 02f0e2510ce428b6dd89251ec63b5806b34e8e02302c7fa8fb1d9460a4e8c073b4650c066183ef20dc554440721f0b659a6ea30ad38f05865fb0fccc1cca758f
-EBUILD wapiti-3.0.2.ebuild 1047 BLAKE2B b3dbfb21b0676bfdd7f5925867425732c7c92230e8a984a151bc041b22e0ca43b938ffc1f5e649c46caa6bbf6146e68581f62a2ab0926281d7da1d25012caa26 SHA512 329e727feca73a88abf22b5b013933f48491973f1d1ae8add7c19b92edff85e03971963bd1dd1c80a94213a3c8bcd58586f2ee79c4f46f032084fd58e1fcd278
-EBUILD wapiti-9999.ebuild 1015 BLAKE2B 20b7a692c73605163dfb9ef9a40340516c2a3d895654d31665d259dfc491beac275727a6b5cb485086470dedae4a064d267f4267c7c4f5c352729ce453ab3a2e SHA512 a9d14f954e9f9a9e85f3d8fd091df7abe55f6014e246bdda0a6208a7157eb7161480bdc0725956225564440104eeab9cb73e0b755d3529e131324ed5cec57e4b
+EBUILD wapiti-3.0.2.ebuild 1043 BLAKE2B e15a894c9b436994abcbe7c8298f424b12b220000aa30a06f66fef5dcf15faef150fc30264c277e4cd8962e4db1fdbbce85e0bf70f588c7ee3c1164fe6871662 SHA512 abe41d4195058fbcb9175523c39ade25eb94ff803a582eb5aa0ace1da10917d2c7c1d3b063e130fa85888c7e4f39a77f9338cfaa7a05c54df4209966137d625b
+EBUILD wapiti-9999.ebuild 1011 BLAKE2B ad1a5f599415bda5114ec1573e309c649b5e0a9605814d424f2efbfb30fb7020e9a868e3670ce31e11461bda779603c444fb461f45b77f1ae25a28ecfe466ca9 SHA512 3539e6093bd5219b5a6066e9708ee2a99501c01b868b3deef677fc9a45e8a75e8fdf94e05ab8c0a34ae86dc5cdd4b60e8b933162b7695f22cb5f92318a0661d0
 MISC metadata.xml 864 BLAKE2B 9551f009fa754e945364018cc66edcedc0b032929983895547b21dfdac4ad1a4dd33e72ef8613f4ed622631f04a96c4560a4a379b572e986086f8c5a9955d85c SHA512 6af9d0300f0d9edeff11f0478aaf2461337ac36c78ce3d0dd9c3fe30be33cb2b96a1e5fee2c4fe9e89c75bedd06347fd6ca27dfac8bc0d9c0539615487310f25
diff --git a/net-analyzer/wapiti/wapiti-3.0.2.ebuild b/net-analyzer/wapiti/wapiti-3.0.2.ebuild
index 79510fa709f7..e54191bc86f1 100644
--- a/net-analyzer/wapiti/wapiti-3.0.2.ebuild
+++ b/net-analyzer/wapiti/wapiti-3.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE='xml'
 
 inherit distutils-r1
diff --git a/net-analyzer/wapiti/wapiti-9999.ebuild b/net-analyzer/wapiti/wapiti-9999.ebuild
index 14fd985c3532..3b16236056bc 100644
--- a/net-analyzer/wapiti/wapiti-9999.ebuild
+++ b/net-analyzer/wapiti/wapiti-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE='xml'
 
 inherit distutils-r1 git-r3
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 725e8616347c..65bd5118bcae 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -6,11 +6,9 @@ AUX wireshark-99999999-qtsvg.patch 160 BLAKE2B f282867fc9cf3d770fb6abb5e6e9b471e
 AUX wireshark-99999999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3
 DIST wireshark-3.0.3.tar.xz 30923980 BLAKE2B 05f29f55061d0bed9be284e145d260fca5e0051893c044b1389e1389f2c9865c7ec4c548ea040c6bd853d4fe1c482c5c86fdb23aa79d588ad34b91ed1901bcf0 SHA512 78d4aa68e47a72b641cb2a694028de743c195a41c42fb58f510402581a213c1239f63cad1f9163b13d64608fcedf64c7367a4888021b80613cb7e9a6ddbf8750
 DIST wireshark-3.0.7.tar.xz 30851928 BLAKE2B 98d31a260b2f5f74a567161e9dc0c136bb6bb29bcd4fc303f099c8b1379668194c2463e0661041061fe4c462db20c846694beae9286d322ce887332cce45341b SHA512 64e242510865ca69e688677e3ee1f72d3efa2155f07bc1aacc6de19ffab06f26b1ef8a3f91a90e91a6612b10d75651aea6400f8c5852e6a7e82e5d3f3e88e031
-DIST wireshark-3.2.0rc1.tar.xz 31426064 BLAKE2B e7fd605701aec50bf982f3775902ca6289862422a2e69dc42308f5955b8a74c3b059553fd187de66b2c771f27062517c6b690fd9af787dfdea44e589759f856a SHA512 6dfc1f46f8555798dbb1d1e6ba49cdebb497155559af6733e38819882059aa6db6fc0e72a84e30b5255ec46dda5b2245de905035415c0ef24b71a616c4b94111
-DIST wireshark-3.2.0rc2.tar.xz 31454312 BLAKE2B 41c25634d89c4e107a65278d679a17c7b21f8b9c566b394ae8b410a8ed38c4ccce4244b12f95c24c2d50c21bba05077cf068ec1e59f3d9c29bc58207c7020afc SHA512 c24bc0358127105f00efe9c79b012eb4f5b5fafd987f3cd47bf5079cb4d4f92810fd5fda207385d031ebe5afd2b26804f911509b85cbc672fa5c2d1d8e69130d
-EBUILD wireshark-3.0.3.ebuild 6594 BLAKE2B 92f6526f2ce0313b1013dc70a4b369c04ed58dfffb7577e041652e73b0a15436d07dbdff098e8561fbed72aa33b1e0510b2cc2203b19e76d60789506c93bd50e SHA512 3bb758b5ed50c51c2cbd6bf0e8e93ca68be079d51dd82dcfeac4fd599048cf087b23f9a7854348a912d9d8c422468193d4c341948c07f4cfa9c678e2806241fc
-EBUILD wireshark-3.0.7.ebuild 6596 BLAKE2B 127a3d8748f3fa9af8963d79870480f20c3e2d5aad306e19d558520155b2d07f789df84e6430338af984c3bd5a608de26f4edff3e340a0ef2c40216a81f2eb95 SHA512 c3d5917d949cf501b59fe4de8239faa8d52be95394d5a21c7361b70e7bee4b5ca0d906062da2b658a96b35671a1ee1114837d7c86ebdac487f9e3f17610a6312
-EBUILD wireshark-3.2.0_rc1.ebuild 6744 BLAKE2B c01c85d65aac4bb522aa4382f4a82a5915c6739bb53e570e2c827df7cc05e82837df48f6b0f1573336970fbae84ff0db02947689931242185fd0b78a0c80198d SHA512 15b9e6adf6dceb859652116a3cfa4a0428e4b52ae42f552a2b33a44a50cc4055f808873b955788684e96478d86d9d1f7a23efe983096c1b396138b5283689b9f
-EBUILD wireshark-3.2.0_rc2.ebuild 6744 BLAKE2B c01c85d65aac4bb522aa4382f4a82a5915c6739bb53e570e2c827df7cc05e82837df48f6b0f1573336970fbae84ff0db02947689931242185fd0b78a0c80198d SHA512 15b9e6adf6dceb859652116a3cfa4a0428e4b52ae42f552a2b33a44a50cc4055f808873b955788684e96478d86d9d1f7a23efe983096c1b396138b5283689b9f
-EBUILD wireshark-99999999.ebuild 6685 BLAKE2B 522b1a0ab6ee888263297fdd52751d3d4026d1725005086b0aa7825bebdca430bc8bd2b5ad871da51a3b2929e5401026208a457d7d04ec45cca557ff87224a33 SHA512 485eefc016acafe5cd0f85208569d52e5170ab9494e175579a5fed7ecdbb5b7f4bf807ae9858e49e3c26baf8c3a962a00d12ad28c1430afba22c6513a719d500
+DIST wireshark-3.2.0.tar.xz 31550972 BLAKE2B 421304132d3c07ae9cce8e388e93080d12ce430311f9bf4e0bfe165a4d45604169153a262bd1625bc00d8b59a8f62538251484f75c8e7c97d4d41df700ff28fc SHA512 30d2d6da4f32167518ec045c9e07f952fa6589a4cde18a765dcc375264005ac9146a36faee77bf701e786ff32b9a673f3f03ccf9ba6c9cb51b2cc120bcabbfcf
+EBUILD wireshark-3.0.3.ebuild 6592 BLAKE2B 977a69abacaddc8afda497edfba07e1034fc026e3eecd178d803eb7508353332b85a2a3d250842009e0bce9c8565b1a85bec5edaa6190d7e4472d50d286d6c98 SHA512 9f01985c9478af947ed9eb9d98eaebfc875e6cdd5f7887c6496aace5af4e16f3b3238be270327dbf6166ddcc49916665a591e74465c5cfc8e07ce3f20973e192
+EBUILD wireshark-3.0.7.ebuild 6593 BLAKE2B a296ff8807c208aa809e5aca04a7e2c9b1ad30f8287eb6c5dd765a34771f67a3410dfe76d2f73793958ccdc93c95ffa0d8cd0d80a96196c0e8b39ebaef1710b7 SHA512 761798113a2db0ce1c37c70f115987c60e5a99bde42ca85662ba141108d857d94de05e9c0b37d4a4c9b4a02e59a3389b30f56b0490a6b707e580ec033af672f9
+EBUILD wireshark-3.2.0.ebuild 6718 BLAKE2B 3c2cedfb955f07c93f84ea62b9af397febd7caf65b648438234775709f222a8895afa1638aa356c991c00ce8ffba100d4f16e814c02188843332ca5615bdc9d3 SHA512 4753448804f896123c849dafb593a443789c7830988bf063cfd70b6449b5571b9d9f7b960f501056faee097b9cc1f3d47310081929c776b09ee837e85657f9eb
+EBUILD wireshark-99999999.ebuild 6659 BLAKE2B ccf541efd87e59e2cd4519ab35bef2805ed5bfc47ff035c09b3fa120cc28af43d9e73ae23fd7d1176d6cc602b53f76e0c51422c05f0586497a6ff00dfd2b3e79 SHA512 0163f63e17c3458d2380992776f8ccec60d566ca42c49ad248d83f41f1ff76a45e9b279041d5e2d42fb02a4556f66de01b7795715d206f9286638b8c38801971
 MISC metadata.xml 4963 BLAKE2B b3c0a51c2ffc96313fe46be2f4b970c0a22d7b479a3701a717531f7b9c46ff5b00b1d3a29a54295abb90989226afb679f2d4842c2ade5f4f1c2d7923121591b8 SHA512 03cdfa1a78a23ae572eb0eacf787b1edba135541ab94d899dad77c6f0d482d9303fa0168033a3a60a8e12dd54506999ea5bd323dc0a90c58d87d8640bda139d2
diff --git a/net-analyzer/wireshark/wireshark-3.0.3.ebuild b/net-analyzer/wireshark/wireshark-3.0.3.ebuild
index 73cc78d498c1..587fbb137111 100644
--- a/net-analyzer/wireshark/wireshark-3.0.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit fcaps flag-o-matic multilib python-r1 qmake-utils user xdg-utils cmake-utils
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
diff --git a/net-analyzer/wireshark/wireshark-3.0.7.ebuild b/net-analyzer/wireshark/wireshark-3.0.7.ebuild
index 173425dd9486..0813a4658f42 100644
--- a/net-analyzer/wireshark/wireshark-3.0.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.0.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit fcaps flag-o-matic multilib python-r1 qmake-utils user xdg-utils cmake-utils
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
@@ -11,7 +11,7 @@ SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc64 x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc64 x86"
 IUSE="
 	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon
 	+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
diff --git a/net-analyzer/wireshark/wireshark-3.2.0_rc1.ebuild b/net-analyzer/wireshark/wireshark-3.2.0.ebuild
index 3252cadf725c..931de56a7b37 100644
--- a/net-analyzer/wireshark/wireshark-3.2.0_rc1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
-inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils cmake-utils
+PYTHON_COMPAT=( python3_{6,7} )
+inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils cmake
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="https://www.wireshark.org/"
@@ -168,15 +168,15 @@ src_configure() {
 		-DENABLE_ZLIB=$(usex zlib)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
-	cmake-utils_src_test
+	cmake_src_test
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# FAQ is not required as is installed from help/faq.txt
 	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
diff --git a/net-analyzer/wireshark/wireshark-3.2.0_rc2.ebuild b/net-analyzer/wireshark/wireshark-3.2.0_rc2.ebuild
deleted file mode 100644
index 3252cadf725c..000000000000
--- a/net-analyzer/wireshark/wireshark-3.2.0_rc2.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
-inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils cmake-utils
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/"
-SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
-LICENSE="GPL-2"
-
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
-IUSE="
-	androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon
-	+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
-	+minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump
-	+reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
-	+text2pcap tfshark +tshark +udpdump zlib
-"
-S=${WORKDIR}/${P/_/}
-
-CDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=net-dns/c-ares-1.5
-	dev-libs/libgcrypt:0
-	bcg729? ( media-libs/bcg729 )
-	brotli? ( app-arch/brotli )
-	ciscodump? ( >=net-libs/libssh-0.6 )
-	filecaps? ( sys-libs/libcap )
-	http2? ( net-libs/nghttp2 )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( dev-libs/libxml2 )
-	lua? ( >=dev-lang/lua-5.1:* )
-	lz4? ( app-arch/lz4 )
-	maxminddb? ( dev-libs/libmaxminddb )
-	minizip? ( sys-libs/zlib[minizip] )
-	netlink? ( dev-libs/libnl:3 )
-	pcap? ( net-libs/libpcap )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		x11-misc/xdg-utils
-	)
-	sbc? ( media-libs/sbc )
-	sdjournal? ( sys-apps/systemd )
-	smi? ( net-libs/libsmi )
-	snappy? ( app-arch/snappy )
-	spandsp? ( media-libs/spandsp )
-	sshdump? ( >=net-libs/libssh-0.6 )
-	ssl? ( net-libs/gnutls:= )
-	zlib? ( sys-libs/zlib )
-"
-# We need perl for `pod2html`. The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
-	${CDEPEND}
-	${PYTHON_DEPS}
-"
-BDEPEND="
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-ruby/asciidoctor
-	)
-	qt5? (
-		dev-qt/linguist-tools:5
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	qt5? ( virtual/freedesktop-icon-theme )
-	selinux? ( sec-policy/selinux-wireshark )
-"
-REQUIRED_USE="
-	plugin-ifdemo? ( plugins )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4-androiddump.patch
-	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
-	"${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch
-	"${FILESDIR}"/${PN}-99999999-androiddump-wsutil.patch
-	"${FILESDIR}"/${PN}-99999999-qtsvg.patch
-	"${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch
-)
-
-pkg_setup() {
-	enewgroup wireshark
-}
-
-src_configure() {
-	local mycmakeargs
-
-	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
-	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
-	if use kerberos; then
-		case $(krb5-config --libs) in
-			*-lcrypto*)
-				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
-				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
-				ewarn "license and the GPL, so do your check before distributing such package."
-				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
-				;;
-		esac
-	fi
-
-	if use qt5; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	fi
-
-	python_setup
-
-	mycmakeargs+=(
-		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
-		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
-		$(usex qt5 MOC=$(qt5_get_bindir)/moc '')
-		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
-		$(usex qt5 UIC=$(qt5_get_bindir)/uic '')
-		-DBUILD_androiddump=$(usex androiddump)
-		-DBUILD_capinfos=$(usex capinfos)
-		-DBUILD_captype=$(usex captype)
-		-DBUILD_ciscodump=$(usex ciscodump)
-		-DBUILD_dftest=$(usex dftest)
-		-DBUILD_dpauxmon=$(usex dpauxmon)
-		-DBUILD_dumpcap=$(usex dumpcap)
-		-DBUILD_editcap=$(usex editcap)
-		-DBUILD_mergecap=$(usex mergecap)
-		-DBUILD_mmdbresolve=$(usex maxminddb)
-		-DBUILD_randpkt=$(usex randpkt)
-		-DBUILD_randpktdump=$(usex randpktdump)
-		-DBUILD_reordercap=$(usex reordercap)
-		-DBUILD_sdjournal=$(usex sdjournal)
-		-DBUILD_sharkd=$(usex sharkd)
-		-DBUILD_sshdump=$(usex sshdump)
-		-DBUILD_text2pcap=$(usex text2pcap)
-		-DBUILD_tfshark=$(usex tfshark)
-		-DBUILD_tshark=$(usex tshark)
-		-DBUILD_udpdump=$(usex udpdump)
-		-DBUILD_wireshark=$(usex qt5)
-		-DCMAKE_INSTALL_DOCDIR="${EROOT}/usr/share/doc/${PF}"
-		-DDISABLE_WERROR=yes
-		-DENABLE_BCG729=$(usex bcg729)
-		-DENABLE_BROTLI=$(usex brotli)
-		-DENABLE_CAP=$(usex filecaps caps)
-		-DENABLE_GNUTLS=$(usex ssl)
-		-DENABLE_KERBEROS=$(usex kerberos)
-		-DENABLE_LIBXML2=$(usex libxml2)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_LZ4=$(usex lz4)
-		-DENABLE_MINIZIP=$(usex minizip)
-		-DENABLE_NETLINK=$(usex netlink)
-		-DENABLE_NGHTTP2=$(usex http2)
-		-DENABLE_PCAP=$(usex pcap)
-		-DENABLE_PLUGINS=$(usex plugins)
-		-DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
-		-DENABLE_SBC=$(usex sbc)
-		-DENABLE_SMI=$(usex smi)
-		-DENABLE_SNAPPY=$(usex snappy)
-		-DENABLE_SPANDSP=$(usex spandsp)
-		-DENABLE_ZLIB=$(usex zlib)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
-	# install headers
-	insinto /usr/include/wireshark
-	doins ws_diag_control.h ws_symbol_export.h \
-		"${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
-
-	local dir dirs=(
-		epan
-		epan/crypt
-		epan/dfilter
-		epan/dissectors
-		epan/ftypes
-		epan/wmem
-		wiretap
-		wsutil
-	)
-	for dir in "${dirs[@]}"
-	do
-		insinto /usr/include/wireshark/${dir}
-		doins ${dir}/*.h
-	done
-
-	#with the above this really shouldn't be needed, but things may be looking
-	# in wiretap/ instead of wireshark/wiretap/
-	insinto /usr/include/wiretap
-	doins wiretap/wtap.h
-
-	if use qt5; then
-		local s
-		for s in 16 32 48 64 128 256 512 1024; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/apps
-			newins image/wsicon${s}.png wireshark.png
-		done
-		for s in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
-			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
-		done
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-
-	# Add group for users allowed to sniff.
-	enewgroup wireshark
-	chgrp wireshark "${EROOT}"/usr/bin/dumpcap
-
-	if use dumpcap && use pcap; then
-		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
-			cap_dac_read_search,cap_net_raw,cap_net_admin \
-			"${EROOT}"/usr/bin/dumpcap
-	fi
-
-	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
-	ewarn "add yourself to the wireshark group. This security measure ensures"
-	ewarn "that only trusted users are allowed to sniff your traffic."
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 18b738bc9381..a228b3f00e24 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
-inherit fcaps flag-o-matic git-r3 multilib python-any-r1 qmake-utils user xdg-utils cmake-utils
+PYTHON_COMPAT=( python3_{6,7} )
+inherit fcaps flag-o-matic git-r3 multilib python-any-r1 qmake-utils user xdg-utils cmake
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="https://www.wireshark.org/"
@@ -168,15 +168,15 @@ src_configure() {
 		-DENABLE_ZLIB=$(usex zlib)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
-	cmake-utils_src_test
+	cmake_src_test
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# FAQ is not required as is installed from help/faq.txt
 	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
diff --git a/net-analyzer/xnetload/Manifest b/net-analyzer/xnetload/Manifest
index 685a71d99879..d9672e21f7af 100644
--- a/net-analyzer/xnetload/Manifest
+++ b/net-analyzer/xnetload/Manifest
@@ -1,3 +1,3 @@
 DIST xnetload-1.11.3.tar.gz 24551 BLAKE2B f23ebc6609a2824f2b60aa045f505422df87ed21e622e4267f850f2d5954b312019d68a9738512e92f30e7f1745886743a82d3f08fcae1e1adff3acf4294ec6b SHA512 2008102c132ee96b12251b7c2475efcae7926bb16ba032f75d6be42650785fb707bed3696586369c04bb0e9434ee7854de585e7a015f1a15037a7f30c86036b7
-EBUILD xnetload-1.11.3-r1.ebuild 845 BLAKE2B 3a0a636367002bbcae7d7a0c3bcf419972cc77a36c2714838e3804e40bd155f1b6ebc1b4b35c1a405cc0b28d1b5cba489353f1f53a354f9ca81b9177630e41a6 SHA512 4ee0278265541b2c8812f79d32fb2bdacd29147abc923ef714cf984c0f1337f38a245dfdb529b44aee010b719987d55c54bcbcada3f368afb822ad55fbe620b6
+EBUILD xnetload-1.11.3-r1.ebuild 872 BLAKE2B 1c61f7936883cccf942a54c6859dda7ba93888344b91e63355d0830d9f01c0b1c19ae4ad738d9fbb9647605c11f4fdc7ea946193166edc2b0012c9d950365374 SHA512 b87e27172a0e49486f15cd576ddca5d9952216345a712326a21bd041b77c0b2dfe66abdce1d11a43b90bb0f4936ac8b1717cce37d085a4e72637e040421962aa
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild b/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild
index 4844a6cb930f..8a4e8e5520b5 100644
--- a/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild
+++ b/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 DESCRIPTION="displays a count and a graph of the traffic over a specified network connection"
 LICENSE="GPL-2"
 HOMEPAGE="http://www.xs4all.nl/~rsmith/software/"
-SRC_URI="${HOMEPAGE}${P}.tar.gz"
+SRC_URI="http://www.xs4all.nl/~rsmith/software/${P}.tar.gz"
 
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 77cee550d80d..fd19b5cc544e 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -34,5 +34,5 @@ EBUILD zabbix-3.0.28.ebuild 9212 BLAKE2B 01d604dbdcbdbb6494382aab59a5d7ab10142c0
 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 9462 BLAKE2B c2e612abec395560c4ca7e1d081c78045ebbfbd17be9b4d7ce39b44b3c32ee7e8e2a16974675e10a666239a8a0feecc7e3b527a20e71630680dbe00c5b5c92ea SHA512 4c020e6d1287cccaf7c70c567a347aec0b476c60cb0907ac925c0280a6b56a0ffb050f3a53130910d1e1c7fe07b36e7e18f20736afd4c4776cefe2b4ea5e4b38
+EBUILD zabbix-4.4.0-r1.ebuild 9460 BLAKE2B 7d5e689fac185731cd79ffd6c8feee7a78c7b02d49bc9e72191cb0daa3828bd9638337be9a7356967c85a788ac70fd0f4377904d9f13a83997aaaacb6c9701f4 SHA512 d3154d91a3fe4fe69e6f99a69ee255ab5f95360d19597031c382dff6ab76a5f3c8e6c25e4115c484bf39c1400afb74496405f9f5645da40513b9cd417506b8da
 MISC metadata.xml 1402 BLAKE2B 02819796719872a78ba4f7f534344bcde607fd95d10ae0087d62b65490289946f81a70b6ae5341ed6579f4855e998fc46bcff6cc463aa7feb4e768736509128a SHA512 8d3ad204e8cfb4d2aa76f0af90c77d7b6e4cc13da54772d95fe43d68bf85eb96e9d96bc2b11b08421e4684b03ad53042a4f4c0a44817f0e4ea804b81996cda5a
diff --git a/net-analyzer/zabbix/zabbix-4.4.0-r1.ebuild b/net-analyzer/zabbix/zabbix-4.4.0-r1.ebuild
index e5ef1c2c0b80..bf5db4ac645c 100644
--- a/net-analyzer/zabbix/zabbix-4.4.0-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.4.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stab
 LICENSE="GPL-2"
 SLOT="0"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
+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 ) )
author	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
commit	21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree	e1810a4b135afce04b34862ef0fab2bfaeb8aeca /net-analyzer
parent	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)