gentoo resync : 24.12.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
commit: de49812990871e1705b64051c35161d5e6400269 (patch)
tree: 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /net-analyzer
parent: 536c3711867ec947c1738f2c4b96f22e4863322d (diff)
105 files changed, 2204 insertions, 2187 deletions
diff --git a/net-analyzer/2ping/2ping-4.0.1.ebuild b/net-analyzer/2ping/2ping-4.0.1.ebuild
deleted file mode 100644
index 0d7959a2a340..000000000000
--- a/net-analyzer/2ping/2ping-4.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A bi-directional ping utility"
-HOMEPAGE="https://www.finnie.org/software/2ping/"
-SRC_URI="https://www.finnie.org/software/2ping/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE="server"
-
-src_install() {
-	distutils-r1_src_install
-	doman doc/2ping.1
-	dodoc doc/{2ping-protocol-examples.py,2ping-protocol.md}
-	use server && {
-		doinitd "${FILESDIR}"/2pingd
-		newconfd "${FILESDIR}"/2pingd.conf 2pingd
-	}
-}
diff --git a/net-analyzer/2ping/2ping-4.1.ebuild b/net-analyzer/2ping/2ping-4.1.ebuild
deleted file mode 100644
index c99ba3938765..000000000000
--- a/net-analyzer/2ping/2ping-4.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A bi-directional ping utility"
-HOMEPAGE="https://www.finnie.org/software/2ping/"
-SRC_URI="https://www.finnie.org/software/2ping/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE="server"
-
-src_install() {
-	distutils-r1_src_install
-	doman doc/2ping.1
-	dodoc doc/{2ping-protocol-examples.py,2ping-protocol.md}
-	use server && {
-		doinitd "${FILESDIR}"/2pingd
-		newconfd "${FILESDIR}"/2pingd.conf 2pingd
-	}
-}
diff --git a/net-analyzer/2ping/2ping-4.1.2.ebuild b/net-analyzer/2ping/2ping-4.3.ebuild
index 688c698a7823..9e42a33b3dd6 100644
--- a/net-analyzer/2ping/2ping-4.1.2.ebuild
+++ b/net-analyzer/2ping/2ping-4.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 PYTHON_COMPAT=( python3_{4,5,6} )
 
diff --git a/net-analyzer/2ping/Manifest b/net-analyzer/2ping/Manifest
index 0310e3907897..5cf3fe9e82cf 100644
--- a/net-analyzer/2ping/Manifest
+++ b/net-analyzer/2ping/Manifest
@@ -1,11 +1,7 @@
 AUX 2pingd 692 BLAKE2B f393bc602a4e39f77970946926bae178f9181476f7331b9a91f1dddc689ba360d8479b28e9a0b16d25864954664e6b0915149077620aa9d0fec00a85ef68b257 SHA512 7d898b96e6888233b7628af7a9a0641a4ce2f6ebe38192b88bb7f479d99067f6d34843f1b43746eed03b7512782496534e35240abf8b866a4e8f00ee9421deb1
 AUX 2pingd.conf 57 BLAKE2B 79c2a05661e342d5a5c3903071d42864d3185d6f387a6b73f129a70cadfadf081f43d9bdfea22281170b0ad27ec17f9b3612cf40b570390f44f845d7ca4555d0 SHA512 c8c666116e841b86a1f17a891453e6ea25976ad485b8299062971b45395420dd46ecc9ac36cb1de5000207372f8586850f62c6178ece5f70732bf17ae9ab4af9
-DIST 2ping-4.0.1.tar.gz 67347 BLAKE2B 88ef9b626399682a93892a933ab75ac0caa994e38b11aac287f4114472e9869a2b577f301c4fd036940cfafb62e57ff52382f2413038b433c9ed4fedd87e1696 SHA512 21d3f9f8833d10f7d9f692e0d3a8dbe524ee5ad064122d808aad99f295389efc51c3979ff0dc9533705363be21e0457a886ba0d8a4532705791a4fdf24050eb7
-DIST 2ping-4.1.2.tar.gz 69591 BLAKE2B e96e8ca7907a0a4c7a7cebfd8130469efe00bff96dfaee50f6f2156750a73014054cdfe9d848ad369e3a2dbc52b3b46f262391024f300d48b8d8628573ff5fed SHA512 566acd3638b47b34c06f59f6e7a3793aa1fc60cb6b0ca108f8544afe55a8680c57bcb212fe70433ae99c02d4e8359a91eaeaed4b1d820fa9d072143424c5e54a
-DIST 2ping-4.1.tar.gz 69510 BLAKE2B f7245876bb66ebab55cf0a98f29402dc8dcd9e1e97fbf635ff1232501c7dd23d8a707a378bd6c73084b3c2e946347f24edef6347693015fdb812d78cadab1fef SHA512 926a515156bf0b9e7c09e72f0e557571f3905646eaec2e8c4702a7dd7ed77b9ab298323028beb02c844d719839458f9d056fb5d29443e908b0d927754f856553
 DIST 2ping-4.2.tar.gz 70054 BLAKE2B 01759c9f0d2eb2bf08e92155a74e11aaf7bb83adb43942be70b8e525486bba6608ad021bb149376f246bdcb066958c7d9886a1e5ea63094d715c8b25fa2b9784 SHA512 8c6e9b4cefd92929e8d5247f2c4caecdfc281548596f96fbfe52f99dc122dd1d53470c303e85bc469f0a7910937085ad36c7f928cb295c8f3fce5f3455dec3d9
-EBUILD 2ping-4.0.1.ebuild 637 BLAKE2B 4ea67a294fa421c23d2979b47c41345a12463bfc13db539708f7f279b04965375c9a8561c3bd2c87e968534976bd395f56a7cdbeb42bfce3aa2ea3f7b011424e SHA512 f9269a4595ff43bb30cb45e64f9113fa0ec39ed3665fc22b283356a79e6c0e4b48048815747af5cb57914c5414210357e5e101fb59a6bfa951a513c8fb0bc475
-EBUILD 2ping-4.1.2.ebuild 633 BLAKE2B da35f0b2a81797580163aacab68d13b8f71896c2172f7e10dcf3b4f052cd71f864d67050cee840ba92cbe3796ad77099ee27cf1bb9041e10ac6620691c414a04 SHA512 8d93bf7be8b3bea47bbbf9505684bc0cb0358c5ce90653dab6e3ad8fe67b106f49b960549560933e82865623a1fe7c2c754390e8e69932f72d3f5c9dc195ddd4
-EBUILD 2ping-4.1.ebuild 633 BLAKE2B 2e3d8ec81374ad4890aef3c2d6d834e653d9c1a2fad4718b40eec5dbe2bdfc5242e626601302351054b223a582d5b055daf78d55099ee2521e4f4392b6126ee9 SHA512 f31e0a9f1e9ffaa3a4b3a1d1360a5038fa479250414e641d04dcf29b798ca05a98a78e18665d850d2d746e554d6ef265b68ae7340a1153f8ac7aa9171dbdeeb2
+DIST 2ping-4.3.tar.gz 70386 BLAKE2B 7a73508bdf5fef0d6ef99d1d6b8bfdee65740277ef0e17913e2070503c20bd4d9598a7d7353eb68dbe5c7380e49e465ddd49adba4899f95daead36bbc8514f69 SHA512 f7186fe5bed2f12593d62f85fe364c9dc571f8b0ad10f6766515470ea8f8ed32d439e580003e78494b4742a8224e2b30cc454f8275a4877d432eb76646334e77
 EBUILD 2ping-4.2.ebuild 633 BLAKE2B da35f0b2a81797580163aacab68d13b8f71896c2172f7e10dcf3b4f052cd71f864d67050cee840ba92cbe3796ad77099ee27cf1bb9041e10ac6620691c414a04 SHA512 8d93bf7be8b3bea47bbbf9505684bc0cb0358c5ce90653dab6e3ad8fe67b106f49b960549560933e82865623a1fe7c2c754390e8e69932f72d3f5c9dc195ddd4
+EBUILD 2ping-4.3.ebuild 630 BLAKE2B 53aa3c5acc7802801b6276f381311efa0e56fbb8fc8a917f1c2c096add2e2eaed763b56f2311d4eb38d3e25d920cfda56ebbf8ec88363b21c1d07d853bafce8b SHA512 4c57d67ba7e8c09fb85c34dabbe0e2c97487fac4cc9a21bafa2b193fb3d6b0956363a9ee636f03676e28e34642182b33629ec8c62d6135785030337f35792967
 MISC metadata.xml 400 BLAKE2B 8de660bda8c58cc5c6e6027c7e52efbd03ef973594e85a90483f0bb0dd2fcdcc4ee7989cf8624e72f0e71f31daf5af05c345126b862cad1007c3a45a8122bcd4 SHA512 9d35147319cbab8e826a2f0a8badee2169e70b8a52065d8639f2326ff0bfe1717a5e8b5422072f71677e2e4a99ec14a7d6e688662f2342d7917499c35a686154
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 552b8df730cb..743bc70f8665 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/bing/Manifest b/net-analyzer/bing/Manifest
index be9c1c27c07c..d96ec3591582 100644
--- a/net-analyzer/bing/Manifest
+++ b/net-analyzer/bing/Manifest
@@ -1,3 +1,3 @@
 DIST bing_1.1.3.orig.tar.gz 38847 BLAKE2B ba01ff0e9a53fa8e9cd44ee085d78ae8d8891cc5478697a0d8fb13917c9a4104a672dcc7aba0c6c91e7f0084ac4254b6f565cf44486b6162225c5a21cb1614a7 SHA512 df56f93047454a02b305154b12898b063c340e96778db9e11114ac4598446648b3ed5fe4304e0f3e33f612069b0f0e4e231396ee878655683f923ad5418d6242
 EBUILD bing-1.1.3-r2.ebuild 604 BLAKE2B e96192ba7e9eb17aa28a8e66628153ae652fedcbaa916482d81c56c16e7d14fefe0b0948763b048fb9cad3ede0b3f90952444419267b496277384fbc42d1a748 SHA512 1585c67cb662f5b0207a4e5cd6655cc16459e7763341b4482d69ec88998a0215cd2eedbbfd2d3f6c945c3f5ab2be754e2d58cbc022914fe150b64698c2219213
-MISC metadata.xml 243 BLAKE2B f6898ed42cda5e8c4bb81d5737f88ff6118fe3507e7ddcebf4686fa26effb75d03176ee091289e1011788f1a98cab52d5374e29dc04c2c298112c47a2c336f02 SHA512 efed1be9deecfbfc884a140e4ecb918eb473ec755a7910ab9afd29fa236d3c34c09c8d11454a0f8c26331539cbad1461f4824ff348b7fb7335cc88fb51d3882b
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-analyzer/bing/metadata.xml b/net-analyzer/bing/metadata.xml
index 3c3d5ced6412..7a38bb900964 100644
--- a/net-analyzer/bing/metadata.xml
+++ b/net-analyzer/bing/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-analyzer/dietsniff/Manifest b/net-analyzer/dietsniff/Manifest
index 3665c7518e86..6c3b76fa0fb1 100644
--- a/net-analyzer/dietsniff/Manifest
+++ b/net-analyzer/dietsniff/Manifest
@@ -1,3 +1,3 @@
 DIST dietsniff-0.4.tar.gz 14375 BLAKE2B 8a66b0ebe4d010b2337e16b3d00e1defd52590293227e871e33c760b4456fe0dc4c08f2b4efe071807074e75ae5e44e53875e635766b97978f408b7943f343eb SHA512 fb6a1578f7c0554f51f2035449bbde3d810d0ec67c397ebcdf7d43bd704928dd304e2f519372f5b5d9e4168a2a9e5b4f3ccc46341862276d9c3bf3da0132f1fa
 EBUILD dietsniff-0.4.ebuild 846 BLAKE2B 6d9156a76c1bb349f0ae0b04f2597566a3f26ad3677909ea853d77eaa70222cba2d3329d48111e004b88216bb5582f6309146db10f35f5bbabf3d1deec22d301 SHA512 38c5e4a15c9bfb25aaee90a655f5e88ee88d922dc731bb411d4593d58c7b844491d39598d49be08fbfe028b26d3cdfce019ee38bbb7ef995dc1c618e5a23b7c1
-MISC metadata.xml 934 BLAKE2B e14eeeead46aa1141eb1ee48cbf7f4c35d3b0ddeb5a4c80ccdab8960161d483093863c3339437bdb227046da0de647bda506e8e78f03e753226e463af3a29461 SHA512 70ef292e2319c318caedeb622c4f3780341cdc55b2ee08b306a864b1ae9c85b8af28c8b366ff125f68abe8bc97c79439efc599205085d57a1a2f38034ae4f1be
+MISC metadata.xml 858 BLAKE2B 8ed7db380e5a5544961fc5ed50621a65ac4f2bb6db23d079978d497bc509eb4784e22d2d37f5ccc2dac9d65d5aa9de68bb091eb5af419eee73336fbf8fdb6476 SHA512 46811fc9c9c218f2866f2d60c06c3f8d29eef392cb14cc03f1fa6d62b7866c982c86215998033ae18ea0884e7588a9c4716d84e1d3e7252ca4e6c1182bb04578
diff --git a/net-analyzer/dietsniff/metadata.xml b/net-analyzer/dietsniff/metadata.xml
index 87b0150feae6..9a1ccff140a7 100644
--- a/net-analyzer/dietsniff/metadata.xml
+++ b/net-analyzer/dietsniff/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<bugs-to>https://github.com/hynek/dietsniff/issues</bugs-to>
 		<maintainer status="active">
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index f738631b30db..a6d6d5b272ae 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -1,6 +1,6 @@
 DIST fail2ban-0.10.3.1.tar.gz 485826 BLAKE2B 79ca86a601bd79ba3729d4c9b00f20a0717df8c7ceb20183099e11f84cceade274173be90d0b4b000d37a1b9d242e14106c9e7e40e372e450d69bca003fff6fb SHA512 ed3646ef2113fe10d9130c239818087b228ac9708411e26acc412beae022e3f9ff8cea32d824bd491117882fb8f184dcb88bda295bd31e865ac8310c7e27fc7a
 DIST fail2ban-0.10.4.tar.gz 493104 BLAKE2B 3a58ab114cf25172c77b229ce53bf6dd009d4fb8c700142480ba0212072d8820126bfabf5dd417835bdac5f5b65d599c6dde859d8c57267e90cfb569dc4a2073 SHA512 ee53f2e8dc3cda4f588c60da5227d3d71550496ddfdf5bdbffced25bafd442b8e2352a9ad9f27bf76489903b5b779cdb9614963342de907c1036ae9268b8f35f
 EBUILD fail2ban-0.10.3.1.ebuild 3341 BLAKE2B 0b0f7d1f4ca20d23ef9d787c04bc984e9859900f9e3fec4c691338d6638a32e6e9fa4948ce31895821a7cc4787806051059687864c2cde8fce7f13f26ef0e084 SHA512 63c23a53745ce27797eeb686fb896d3dfaf86b7a1c4a7cfddaf1f2438fef6c44dead638719f884d4ed46fe19d40edd204dad20a0d05121d1646d51a5b4a40e60
-EBUILD fail2ban-0.10.4.ebuild 3371 BLAKE2B fb45dfe1c49aa2f04e16c43dbb7164ca61acd0900ddac2f4c94b110b128826a97d4fc13b84396907c98acf84982b294e205d2bf9194830b34cfcfc88c3a3d5f9 SHA512 b12dfa204877368059205bc990e83f3f05aac361c39fc49c1181e9c540b66a1963275058ce9f1147b7bd47555731337422ae9f316451f5df4aa5c0b547220d83
+EBUILD fail2ban-0.10.4.ebuild 3363 BLAKE2B 178fa4a4dee059f63fe8d799ebd5fd54620eb529453f4505266f47358b8cc375cf689cce0310d5cd35bb8fbbd6cc5bb9438232e73e04a075f8059bd854cff65e SHA512 f64f1ba67a5e54ab4f1953438d9d580ae1ffa30e099656c364d3b3f7ff8a20d5cb9736df417dfde36a7a665e43abc68efa5a31f8b329f6950dd713142d677aaa
 EBUILD fail2ban-99999999.ebuild 3215 BLAKE2B 8399290d5bfe3ccc696ba20ae5610bdc514defd6bd10ed0065130af0fb6b9283d8b2b60c70b6a58db7fd378d67a37832f6d0ce699d427785f5755524fd1da723 SHA512 ce07e767c99bbcaafa1305d38fea51d19ddd5ff57e215e7ae72d20ef39084a7f8c1a6a8b0d698e7571d6065bce775d2e9a1ceab2829ae4af4ad758c826d93958
 MISC metadata.xml 372 BLAKE2B 7fca866187d9a128e6fb6787a4099d7a6442e0e51e558786773b91c3e2f06e67167d76f9bc96be0fe1baa1c44fc3f0e9e2105a327a10cb2720b3e3f9e4303a66 SHA512 4d5710e2fb4a7c353ca6bd3203bceef57d4d004367993dc1044800ee8713a3f4697fe8ba3472a73ecd015503656dfb7cd68d674c99188ce5702769cfeaf06b25
diff --git a/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild
index d17adcb58864..4ba2745237db 100644
--- a/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild
@@ -13,7 +13,7 @@ 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="selinux systemd"
 
 # TODO support ipfw and ipfilter
diff --git a/net-analyzer/goaccess/Manifest b/net-analyzer/goaccess/Manifest
index eb8acbb5ca8a..8bdf9d522260 100644
--- a/net-analyzer/goaccess/Manifest
+++ b/net-analyzer/goaccess/Manifest
@@ -1,15 +1,6 @@
-AUX goaccess-0.6.1-CFLAGS.patch 436 BLAKE2B d1b0cc8c0839cbed066898fa6bd848bb3d840ba5aee3cd695689fff749a2486294364972ba7d2ed99e32d1893e25ac87085d6f606e6ee9aa3f417f441c899120 SHA512 f2cb3f242e4f4bea568d0fdf3baf9a7895144d9135c0a85e96ab123f7202ae27797f777f5786c6339bf9d38e737b1398ef72024ed8e3140c7ec43eab3abe833e
-AUX goaccess-0.6.1-tinfo.patch 1412 BLAKE2B 62009b728817853afa9652b316082aa90e1f40e8282ddb39a3f8306107bcb915ba384a8c001da56b863e9f73ed1e4ee46e43fab76b0630344e5db308d37340a1 SHA512 da2c113eccd0e011dbed740c77c80101375b6ab8b0545d733e4bb2c78a3abb71f1546333ca74140c2fdf65cd05b7c15be1298f0b9530bf0523f0d4478c2179ce
-DIST goaccess-0.5.tar.gz 127068 BLAKE2B 0c06668b5be47920273126f47645000d4ea87f7af7946d7e6b3302e609309e534f40195239d7205486840c28e268306a77eeec53884325777999ef70cfcd5a2b SHA512 24c59efca896e24f89aae5f12391398b8649822a5e07ee035a1c265a8987d1ba493155db12b7189c9d637891c81da6414919c9f9f6795831234810f021bb3999
-DIST goaccess-0.6.1.tar.gz 150264 BLAKE2B 9d3d3db8d58e1060d53a5ac2a2e577c24e91640508086622e7c20c88524370308d84b5f4bc21101999fe38a036a990c9712dc74e4ded41410f295881ae0ddde9 SHA512 67712e4af16c6e039ca46f6f8d8302a58be1e0cfd0c76930068c03a9989c35b58b61f7b1e6a9e79cbb978c8f492b80782b8c7b894abc2e067f0a520e2981f98b
-DIST goaccess-0.8.5.tar.gz 189006 BLAKE2B 85faefd62a87a10c703c3bc287e97ba34fcc58b3ff0ea2aa8ad8b92cbf9f968b91d2261b3702efb16aa8344f53f550f5c4c2a7e29edf8f66a10fd5ff3f2c1471 SHA512 736ae69d0c3bbbaf1d06b287c2d600aae1a72255361c9bb40d1c74986932a771c2b401126e75f22ad4be72f6dc053efd262c40ad40cd62efc57c4461d5481c63
-DIST goaccess-0.9.tar.gz 213119 BLAKE2B 447b0301921b069a1234aa7fb69b2bf1b9f5e8974657796b45c202bcc378d8fee07b3e46e5d1bf7f5f5ca6ba8031b27f670360b67d94e2cb5018a05ad71d3156 SHA512 c25703fa31dd673bdb3463e3c5055ba3452f1fdb452c63114663d9dfb28b95ddb4cd89b03fd4a9fdbabd0efebc2e3ab35238fd15bc46727f794d04ba77fc072c
-DIST goaccess-1.1.1.tar.gz 412635 BLAKE2B 947ecd91d74216de61aadadd2317b9bf4b32eab96181e79eb21844e5cd0887f005f139d5fafd4e59c9a18b2faa0c13f40d267f4b2b174a3bc57c7280d892f7d2 SHA512 5ceb21754721603fa6422436fcac158bf3ea0ec54680851ceb6616a3385a2ad1ce38670b3cea62e14178e71c32999260fefbc29a82b115b1a1a30010879184d2
 DIST goaccess-1.2.tar.gz 423103 BLAKE2B 87c527a52db9fa69d6e6a02ffbda64a6a32e6214ca6bc1f2654e1451fe5d73e7caa02cf1416c93c511bee329b7885e4914fb7dfd37562ef5347ea3912d030c14 SHA512 bc31ef1e4c92608635856fa73e69b58267c161a7e3c6f2e3ca8860b862ed1c47575b93943dd975a5f8503774ee90ee0649d380563639e30908d876416638f889
-EBUILD goaccess-0.5-r1.ebuild 993 BLAKE2B 3738be02bbce91af9941e30c6002fdb0e63aa6a19d7399e17d8874e51e9183bedc3d2318bdea3cfd706edbfbe2046b8100fb9f9782aa1e104dbf87eb2c5fc106 SHA512 86244e84b7fe24fd199499ec9fcff2daae13d9d440e507dd1f5e554a63fc1fe747ee38dee5aa8993fad8d31c25ddbecb4050a364bfbcdc7b8591ce4a056211d1
-EBUILD goaccess-0.6.1.ebuild 929 BLAKE2B 984a4c379be10221391933f020cb32653e27e411c62b8294a16b1ec74fc1111a73f2e653c233a658b0d845fe923a5748fa9b520163772b7911739d978dc91077 SHA512 96a818290e67fc1a3c1f6833ed2a8f6abaf57cd9c2738fce5931d40e09c02fdcabbf128240921f9873491ec9c0b33bfb307a80645341f1e9931c7ea96a666829
-EBUILD goaccess-0.8.5.ebuild 1079 BLAKE2B 1fec28fd326ed8e15965441f4df58a64cc10c827167e3d56d729eb8a3400d69281fbbb44de5d5c71ee68db58da1b3fc6c16285293c3b50a4dea4732c8594fb4e SHA512 8d82dca54efa9b5759a095d4106f4e93db633238b653ee65f665e2002c009e9111b37762a15a9f3f6eaa9439a9e1aa76b175a61bfc3c90d7cab936108450e801
-EBUILD goaccess-0.9.ebuild 1088 BLAKE2B 5c36f8803e294c01a26d04bfeab9b8abafe865a8df9685a2396ef184e895dc3de7c1b144af0acc55d8338aaec32b6b6eadce9130602c5e7dbf32b6de43993007 SHA512 0b0c77a68152711e06e30b3a34492a3d095648213c84586c885a5fd69f4c61600ea47c3dfc9ce3ede7fd6f43a929d1de69b68fd60c9d0d32fa8ae0fb12f65ab5
-EBUILD goaccess-1.1.1.ebuild 1280 BLAKE2B 2f7ad866359f70511bd55fcfe7e6253551737759cf69e32b1f02289d66a4af37487db4245a270356f9d3595c8a675c2d91fa65477a87175b85ed9c4f8d81a8db SHA512 2b0784d5f6138c0582f502d37fa82a88c730d3a9589041189ffb54ee1172534c00f8ecf71ffc221e117e583f0b23318fcbd611ab768c65f3d3ded465d06fe012
+DIST goaccess-1.3.tar.gz 541374 BLAKE2B 55942e35d06f1467df9b80a3fc42211e867b08963a7334783c0279ba7b9e0fd8d6e197277bee780547a9b8f6264ae15844374604f6d7c1b3b57f57768c2b2019 SHA512 7ab8a42670c2009459eee6979cb14e32e7e776e89912077882652631d0ce6ff801fba46d91ab5c23af1229f000e220863e9b70336fcd9fe11521d0ae1fd3bde1
 EBUILD goaccess-1.2.ebuild 1398 BLAKE2B 8c819456c94145829b9509e8938790acd090831fb46efe02d32b6494eef9004f77fd264e36927cba70c2517a41e8fe6782b781d59643bda826fff747083a39ac SHA512 b08146d7354977cc33070b01807a5a0ce86a529bfe6002e2a900a4e263d562566477de61ca24ffcfaba9974deae93a525d2d930b0bf2725583440ab39fdc0d3e
-MISC metadata.xml 1285 BLAKE2B 7150db75d1e0efadca73a249c43e5edab081b08f3bf0076fb6f389cfbe61a8f8a3834e435a0ded45fa4510abe3e733980ef6df64a5efa81bde2fdd12960dee02 SHA512 78f3ef78c2b82a194eff376d6403eb4efea871bf43081310e59f3dcc03910cb9c8dab180c6adddd3356c7e5d6f6e13e3bfe062ed90421923de1793a4106e81e6
+EBUILD goaccess-1.3.ebuild 1514 BLAKE2B a0c9c26a6300fa49c3b99778b2e2fc246939d9d21229cf61107a3ea2be381ff972b6d1eee28b09d09d40d84f25db3e02bcd0e250c8318d6fe5981b4209dc081f SHA512 d9f9425bad510a2c454cb717e6ecf35e6342513288b14e8a80bf11f0bfa7889381af95f5f84c486a7bab8f1e4257306bc0a24b636999e461a36e00eabeb4e14f
+EBUILD goaccess-9999.ebuild 1462 BLAKE2B fe2a895d73c2ee02481cfce7883cafff413eede2717428c98cf581c1854ed10529b6c910c7ae1c096e091845d73a204075d745fa51f7721d223d2a938f402456 SHA512 572eaf67fbfeaafd8d3783a75400f179fc2687f94d4410a2091d9f264b795273775af810e60309cb9e82618b20c70f8ac7502b3b5bb996c5af727d5d40368e55
+MISC metadata.xml 1111 BLAKE2B bb28688ec15c422d544dc1aabb460a855687dffad74938643efc545c6c99b2369ab19db620dbaa047f0644b65ba355f4f0e42822400478a5f7d5fcf8960abd7f SHA512 30623dd40bc45ab6bb29f2413a62dd17c66565f9261c3f8b764b97e3b300078897b573b5ebae7f021408792da6d518c294955b8a1fb1dd58d000c4c5cfd0fb4a
diff --git a/net-analyzer/goaccess/files/goaccess-0.6.1-CFLAGS.patch b/net-analyzer/goaccess/files/goaccess-0.6.1-CFLAGS.patch
deleted file mode 100644
index 909b38f5730b..000000000000
--- a/net-analyzer/goaccess/files/goaccess-0.6.1-CFLAGS.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,6 +2,6 @@
- bin_PROGRAMS = goaccess
- goaccess_SOURCES = output.c output.h settings.c settings.h error.c error.h xmalloc.c xmalloc.h commons.c commons.h goaccess.c parser.c parser.h ui.c ui.h util.c util.h gdashboard.c gdashboard.h gdns.c gdns.h gmenu.c gmenu.h goaccess.h
- 
--AM_CFLAGS = -g -Wall @GLIB2_CFLAGS@
-+AM_CFLAGS = -Wall @GLIB2_CFLAGS@
- goaccess_LDADD = -lm
- dist_man_MANS = goaccess.1
diff --git a/net-analyzer/goaccess/files/goaccess-0.6.1-tinfo.patch b/net-analyzer/goaccess/files/goaccess-0.6.1-tinfo.patch
deleted file mode 100644
index 76d6cbcbcf71..000000000000
--- a/net-analyzer/goaccess/files/goaccess-0.6.1-tinfo.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -19,22 +19,20 @@
- AC_ARG_ENABLE(geoip,--enable-geoip Enable GeoIP country lookup, USE_GEOIP="yes")
- AC_ARG_ENABLE(utf8,--enable-utf8 Enable UTF-8 support for wide characters, USE_UTF8="yes")
- 
--if test "$USE_GEOIP" = "yes"; then
--   AC_CHECK_LIB([GeoIP], [GeoIP_new], [], [AC_MSG_ERROR([libgeoip-dev is missing])])
--   CFLAGS="-lGeoIP"
-+if test x"$USE_GEOIP" = "xyes"; then
-+   AC_CHECK_LIB([GeoIP], [GeoIP_new], , [AC_MSG_ERROR([libgeoip-dev is missing])])
- fi
- 
--if test "$USE_UTF8" = "yes"; then
--   AC_CHECK_LIB([ncursesw], [mvaddwstr], [], [AC_MSG_ERROR([libncursesw5-dev is missing])])
--   CFLAGS="-lncursesw"
-+if test x"$USE_UTF8" = "xyes"; then
-+   AC_CHECK_LIB([ncursesw], [mvaddwstr], , [AC_MSG_ERROR([libncursesw5-dev is missing])])
-+   AC_SEARCH_LIBS([stdscr], [tinfow], ,[AC_MSG_ERROR([Cannot find a library providing stdscr])])
- else
--   AC_CHECK_LIB([ncurses], [refresh], [], [AC_MSG_ERROR([libncurses5-dev is missing])])
--   CFLAGS="-lncurses"
-+   AC_CHECK_LIB([ncurses], [refresh], , [AC_MSG_ERROR([libncurses5-dev is missing])])
-+   AC_SEARCH_LIBS([stdscr], [tinfo], ,[AC_MSG_ERROR([Cannot find a library providing stdscr])])
- fi
- 
- # pthread
- AC_CHECK_LIB([pthread], [pthread_create], [], [AC_MSG_ERROR([pthread is missing])])
--CFLAGS="-pthread"
- 
- # Checks for libraries.
- AC_CHECK_LIB([glib-2.0], [g_free], [], [AC_MSG_ERROR([glib-2.x is missing])])
diff --git a/net-analyzer/goaccess/goaccess-0.5-r1.ebuild b/net-analyzer/goaccess/goaccess-0.5-r1.ebuild
deleted file mode 100644
index efe48d4f17d3..000000000000
--- a/net-analyzer/goaccess/goaccess-0.5-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils
-
-DESCRIPTION="A real-time Apache log analyzer and interactive viewer that runs in a terminal"
-HOMEPAGE="http://goaccess.prosoftcorp.com"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="geoip unicode"
-
-RDEPEND="
-	dev-libs/glib:2
-	sys-libs/ncurses:0=[unicode?]
-	geoip? ( dev-libs/geoip )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# respect CFLAGS, bug #451806
-	sed -i -e '/AM_CFLAGS/s/-g//' Makefile.am || die 'sed failed'
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# configure does not properly recognise '--disable-something'
-	local myeconfargs=(
-		$(usex geoip '--enable-geoip' '' '' '')
-		$(usex unicode '--enable-utf8' '' '' '')
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile CFLAGS="${CFLAGS}"
-}
diff --git a/net-analyzer/goaccess/goaccess-0.6.1.ebuild b/net-analyzer/goaccess/goaccess-0.6.1.ebuild
deleted file mode 100644
index 76e6117c2e5a..000000000000
--- a/net-analyzer/goaccess/goaccess-0.6.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils
-
-DESCRIPTION="A real-time Apache log analyzer and interactive viewer that runs in a terminal"
-HOMEPAGE="http://goaccess.prosoftcorp.com"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="geoip unicode"
-
-RDEPEND="
-	dev-libs/glib:2
-	sys-libs/ncurses:0=[unicode?]
-	geoip? ( dev-libs/geoip )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-CFLAGS.patch
-	"${FILESDIR}"/${P}-tinfo.patch
-)
-
-src_configure() {
-	# configure does not properly recognise '--disable-something'
-	local myeconfargs=(
-		$(usex geoip '--enable-geoip' '' '' '')
-		$(usex unicode '--enable-utf8' '' '' '')
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile CFLAGS="${CFLAGS}"
-}
diff --git a/net-analyzer/goaccess/goaccess-0.8.5.ebuild b/net-analyzer/goaccess/goaccess-0.8.5.ebuild
deleted file mode 100644
index 6e14a77788ec..000000000000
--- a/net-analyzer/goaccess/goaccess-0.8.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="A real-time web log analyzer and interactive viewer that runs in a terminal"
-HOMEPAGE="http://goaccess.io"
-SRC_URI="http://tar.goaccess.io/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-
-IUSE="btree debug geoip bzip2 memhash unicode zlib"
-
-REQUIRED_USE="btree? ( !memhash )"
-
-RDEPEND="
-	dev-libs/glib:2
-	sys-libs/ncurses:0=[unicode?]
-	geoip? ( dev-libs/geoip )
-	btree? ( dev-db/tokyocabinet )
-	memhash? ( dev-db/tokyocabinet )
-	zlib? ( sys-libs/zlib )
-	bzip2? ( app-arch/bzip2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	# Fix path to GeoIP bases in config
-	sed -e s':/usr/local:/usr:' -i config/goaccess.conf || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable geoip) \
-		$(use_enable bzip2 bzip) \
-		$(use_enable unicode utf8) \
-		$(use_enable zlib) \
-		$(use memhash && echo "--enable-tcb=memhash") \
-		$(use btree && echo "--enable-tcb=btree")
-
-	epatch_user
-}
diff --git a/net-analyzer/goaccess/goaccess-0.9.ebuild b/net-analyzer/goaccess/goaccess-0.9.ebuild
deleted file mode 100644
index 06d537e9023c..000000000000
--- a/net-analyzer/goaccess/goaccess-0.9.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="A real-time web log analyzer and interactive viewer that runs in a terminal"
-HOMEPAGE="http://goaccess.io"
-SRC_URI="http://tar.goaccess.io/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-
-IUSE="btree debug geoip tokyocabinet unicode"
-
-REQUIRED_USE="btree? ( tokyocabinet )"
-
-RDEPEND="
-	sys-libs/ncurses:0=[unicode?]
-	geoip? ( dev-libs/geoip )
-	!tokyocabinet? ( dev-libs/glib:2 )
-	tokyocabinet? (
-		dev-db/tokyocabinet
-		btree? (
-			app-arch/bzip2
-			sys-libs/zlib
-		)
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch_user
-
-	# Fix path to GeoIP bases in config
-	sed -e s':/usr/local:/usr:' -i config/goaccess.conf || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable geoip) \
-		$(use_enable unicode utf8) \
-		$(use_enable tokyocabinet tcb) \
-		$(use_enable btree bzip) \
-		$(use_enable btree zlib) \
-		$(usex tokyocabinet "--enable-tcb=$(usex btree btree memhash)" '')
-}
diff --git a/net-analyzer/goaccess/goaccess-1.1.1.ebuild b/net-analyzer/goaccess/goaccess-1.1.1.ebuild
deleted file mode 100644
index a1184f2bb1ae..000000000000
--- a/net-analyzer/goaccess/goaccess-1.1.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A real-time web log analyzer and interactive viewer that runs in a terminal"
-HOMEPAGE="http://goaccess.io"
-SRC_URI="http://tar.goaccess.io/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="btree bzip2 debug geoip getline libressl ssl tokyocabinet unicode zlib"
-
-RDEPEND="
-	sys-libs/ncurses:0=[unicode?]
-	geoip? ( dev-libs/geoip )
-	!tokyocabinet? ( dev-libs/glib:2 )
-	tokyocabinet? (
-		dev-db/tokyocabinet[bzip2?,zlib?]
-		btree? (
-			bzip2? ( app-arch/bzip2 )
-			zlib? ( sys-libs/zlib )
-		)
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="btree? ( tokyocabinet ) bzip2? ( btree ) zlib? ( btree )"
-
-src_configure() {
-	econf \
-		$(use_enable bzip2 bzip) \
-		$(use_enable zlib) \
-		$(use_enable debug) \
-		$(use_enable geoip) \
-		$(use_enable tokyocabinet tcb $(usex btree btree memhash)) \
-		$(use_enable unicode utf8) \
-		$(use_with getline) \
-		$(use_with ssl openssl)
-}
-
-pkg_preinst() {
-	# Change path to GeoIP bases in config
-	sed -e s':/usr/local:/usr:' -i "${ED%/}"/etc/goaccess.conf || die "sed failed for goaccess.conf"
-}
diff --git a/net-analyzer/goaccess/goaccess-1.3.ebuild b/net-analyzer/goaccess/goaccess-1.3.ebuild
new file mode 100644
index 000000000000..a38a46ce6f72
--- /dev/null
+++ b/net-analyzer/goaccess/goaccess-1.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A real-time web log analyzer and interactive viewer that runs in a terminal"
+HOMEPAGE="https://goaccess.io"
+SRC_URI="https://tar.goaccess.io/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="btree bzip2 debug geoip geoipv2 getline libressl tokyocabinet ssl unicode zlib"
+REQUIRED_USE="btree? ( tokyocabinet ) bzip2? ( btree ) geoipv2? ( geoip ) zlib? ( btree )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="sys-libs/ncurses:0=[unicode?]
+	geoip? (
+		!geoipv2? ( dev-libs/geoip )
+		geoipv2? ( dev-libs/libmaxminddb:0= )
+	)
+	!tokyocabinet? ( dev-libs/glib:2 )
+	tokyocabinet? (
+		dev-db/tokyocabinet[bzip2?,zlib?]
+		btree? (
+			bzip2? ( app-arch/bzip2 )
+			zlib? ( sys-libs/zlib )
+		)
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	econf \
+		"$(use_enable bzip2 bzip)" \
+		"$(use_enable zlib)" \
+		"$(use_enable debug)" \
+		"$(use_enable geoip geoip "$(usex geoipv2 mmdb legacy)")" \
+		"$(use_enable tokyocabinet tcb "$(usex btree btree memhash)")" \
+		"$(use_enable unicode utf8)" \
+		"$(use_with getline)" \
+		"$(use_with ssl openssl)"
+}
+
+pkg_preinst() {
+	# Change path to GeoIP bases in config
+	sed -e s':/usr/local:/usr:' -i "${ED%/}"/etc/goaccess/goaccess.conf || die "sed failed for goaccess.conf"
+}
+
+pkg_postinst() {
+	ewarn "Upstream moved config to /etc/goaccess/goaccess.conf"
+}
diff --git a/net-analyzer/goaccess/goaccess-9999.ebuild b/net-analyzer/goaccess/goaccess-9999.ebuild
new file mode 100644
index 000000000000..a5512dc51d48
--- /dev/null
+++ b/net-analyzer/goaccess/goaccess-9999.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://github.com/allinurl/${PN}.git"
+
+inherit autotools git-r3
+
+DESCRIPTION="A real-time web log analyzer and interactive viewer that runs in a terminal"
+HOMEPAGE="https://goaccess.io"
+SRC_URI=""
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="btree bzip2 debug geoip geoipv2 getline libressl tokyocabinet ssl unicode zlib"
+REQUIRED_USE="btree? ( tokyocabinet ) bzip2? ( btree ) geoipv2? ( geoip ) zlib? ( btree )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="sys-libs/ncurses:0=[unicode?]
+	geoip? (
+		!geoipv2? ( dev-libs/geoip )
+		geoipv2? ( dev-libs/libmaxminddb:0= )
+	)
+	!tokyocabinet? ( dev-libs/glib:2 )
+	tokyocabinet? (
+		dev-db/tokyocabinet[bzip2?,zlib?]
+		btree? (
+			bzip2? ( app-arch/bzip2 )
+			zlib? ( sys-libs/zlib )
+		)
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# Change path to GeoIP bases in config
+	sed -i -e s':/usr/local:/usr:' config/goaccess.conf || die "sed failed for goaccess.conf"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		"$(use_enable bzip2 bzip)" \
+		"$(use_enable zlib)" \
+		"$(use_enable debug)" \
+		"$(use_enable geoip geoip "$(usex geoipv2 mmdb legacy)")" \
+		"$(use_enable tokyocabinet tcb "$(usex btree btree memhash)")" \
+		"$(use_enable unicode utf8)" \
+		"$(use_with getline)" \
+		"$(use_with ssl openssl)"
+}
diff --git a/net-analyzer/goaccess/metadata.xml b/net-analyzer/goaccess/metadata.xml
index f0fb091e2b59..708d4dfe667e 100644
--- a/net-analyzer/goaccess/metadata.xml
+++ b/net-analyzer/goaccess/metadata.xml
@@ -19,12 +19,9 @@
 		<flag name="btree">Enable Tokyo Cabinet's on-disk B+ Tree database backend</flag>
 		<flag name="geoipv2">Enable support for GeoIP2 through <pkg>dev-libs/libmaxminddb</pkg></flag>
 		<flag name="getline">Use GNU getline() to parse full line requests</flag>
-		<flag name="memhash">Enable Tokyo Cabinet's on-memory hash database backend</flag>
 		<flag name="tokyocabinet">Enable Tokyo Cabinet's on-memory hash database backend</flag>
 	</use>
 	<upstream>
-		<doc>http://goaccess.io/faq</doc>
-		<bugs-to>mailto:goaccess@prosoftcorp.com</bugs-to>
 		<remote-id type="github">allinurl/goaccess</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index ffbe8aa4c7a0..c8e04a89d3fa 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,17 +1,12 @@
 AUX icinga2.initd 2276 BLAKE2B 9573c876cb1fc6ff641d4503d5446840725d94ac2a824cd124872af84032519a5ee1237b0ebc38783e673cb87169feb48b7690978e9b7d2e38549a7272f403fc SHA512 5b31f748eda8f52d8efe2c744c3c1adacffdb40c04d93cdaf7ee82129d632783362f6ea51b5a4c05ca9cd98d3343abfcfc86c98e99afd429d6bce390b9ffd082
 AUX icinga2.initd-2 2682 BLAKE2B 613fdb4fdcef7c95bba710c5fcb6ee84dcb3cd739bf0caa42130e2d1a4faf7341d82447bbac6070567581b90beba261302e8d03c148876db157c68054f64e233 SHA512 1ca1001e6095b17d57cd7ff70a2cc302f6dfa466cbe0a71154dd188caabd31e4b69821a3d8383ed855dcb2d2c396b2141a70de298a6f3c40ab79993c292fa6cb
 AUX icinga2.initd-3 2390 BLAKE2B 1ead1dd958d978324dfa043abcc58be7ed389207e2bf4dc4786bd2705f94c70a03b84f34a55435f6d9dfcc0483e35da60c1f536dec1060bdc232108c622e0615 SHA512 a43911717fe891e70690647daa57426f70d10f9cb02c721962be4c13cfe8a95bc3ff84b9ba2a293adafc8ddacf8ea6771bd66e7ff6dabe3e732176bf6e6e474a
-DIST icinga2-2.10.1.tar.gz 4406432 BLAKE2B cccc60f63faabed43f9a99f313e3835c15afab9d70e1335f987f431f3187907fedb94451457fe4652886e950b1b058952957832bc7fb5ad5e8f6f4f1f47d4178 SHA512 88e0ef1dfd93a399535f3238cb675e86159ca23d1abfd78009797c3533d10ac5c5167008ff04dfc64d4b9f225e75d85947ce85c5a941250699c0d772be9c0aeb
 DIST icinga2-2.10.2.tar.gz 4408535 BLAKE2B f650826feee13695c42d7e6ced45e3009ac607d6af0bcb16c3f93f8099017a74de40e33deefaffb230a519f9dabf410c03745309d203ede71a4d7076ba8c9121 SHA512 2fb30673fbeef395a43eb7947c0c0217d7c0fc9c149bb244d16dae461dd5728a2540e88bcb351bac2ec5d58d6896f8a4789ced5647cdac8cecf0623fff12054b
 DIST icinga2-2.8.4.tar.gz 2510333 BLAKE2B f551a5eadc93d8455612af40e34a0922bc75f41b8064f9989c8f0c28dc2c3fb18963cf9b3272efa29f03973e7cf5824762bebff1bfa1a23c4ba39c93fc29c8e5 SHA512 b2cb5989962ac65da927cbdbac1b3345c913321d507b5113f32dd90bf969b2513478e68d52b9cd4cf255057d74428f9e42067288b7ddc59ad060ca7b84f4f114
 DIST icinga2-2.9.1.tar.gz 2193190 BLAKE2B 29be491c4b43e218ef8aaa2128822040ccb0989e91d83f033cf7873216e4307cdbc8ee9052d79fd22220c396efeb68759acc97938e3ee596e0820e3f6c8f73bc SHA512 1d69a24f85249386e30ff1625cf522ba58e5f2ab641dbe950bf1764324a6c7516d1532942954e842002566823b0f30383747d5ec8b7bd36705aa5f0ccfa29533
-DIST icinga2-2.9.2.tar.gz 2194226 BLAKE2B edf3309711657437439db907f39d9dd04b57ae6b245f4299cfdfc9e8c27d18bdfa704dc5c1459a94d47985103979915a5d2d8594072586cf908e5f8a9d209ee6 SHA512 75a638a37f66a68f47ec161be4bcadbd1ca0e121143528d08d83170209e0b117fa12b1b9a03d1c1550f495bfd0509ca15f4d80be618177f2791b7a1a69308f99
-EBUILD icinga2-2.10.1-r1.ebuild 4737 BLAKE2B e4df75153cd908b76f323f10eb6413615aad342ddb19c84303b47ce43d9b188b897a49e1c27580039b59627879071a462f5473aefebcc82f2f9d3f39a8683ce0 SHA512 85cfcb9e2fd81289ff39b48e36db648fec4b9a766323ad6aa75daec753b49249a47f635e4f3ad8ebc6528a0c5908afddcde6beea4e47fc7e2e11a29afd1a05ff
-EBUILD icinga2-2.10.2.ebuild 4739 BLAKE2B af9e0e626730fb2514cd38c8decf2308046beffffba6df1e5768593da0941f23a702913af03ca67b0a4034dc59cc7a5f0745fe36903a9bb7c4665a4bd06c1705 SHA512 3f6d8bda9d1f4729d3abf162d1d8d883e7da4310a29d83d8468ced54db64b84caf9c27d2c10b128d2ec8d7aeb9cd654c5416904d8deade3b243ec8a851711f06
+EBUILD icinga2-2.10.2.ebuild 4737 BLAKE2B e4df75153cd908b76f323f10eb6413615aad342ddb19c84303b47ce43d9b188b897a49e1c27580039b59627879071a462f5473aefebcc82f2f9d3f39a8683ce0 SHA512 85cfcb9e2fd81289ff39b48e36db648fec4b9a766323ad6aa75daec753b49249a47f635e4f3ad8ebc6528a0c5908afddcde6beea4e47fc7e2e11a29afd1a05ff
 EBUILD icinga2-2.8.4.ebuild 4604 BLAKE2B 074505319ffdb68d93df79dbfe6c2a88a971b1a188e28526dd97e131d7494e6076173cbe9b8ee3599c7deecb62610f23828f0c107460555d47394d29f81eedbe SHA512 be570d2178c8750227b1dfb46c682a1805696fe9b46241f6ef9f59fa1e6ac9886d7e88cc14bcd5e094cd3671f49dfa1ad91046d3e08288b8266f888fde37a2a1
-EBUILD icinga2-2.9.1-r1.ebuild 4433 BLAKE2B aac55d84d5e6318524227b9477fa895d185d87dae43fabad5c0514580799d13f0f4d7c70bdd302333fb467cfdbfd77096ee99f9b15155d22c65c7c14be56ba5d SHA512 40a3f58a913c481d2e54550e7c9b6186f22542225fa069a06228d31a80868b6472ab7df1f5c5640eabcae9f70add5e3562084d27157505689980c0e8a5598331
 EBUILD icinga2-2.9.1-r2.ebuild 4742 BLAKE2B e16c72fda3de6b45a4f6f3682d683f8e037a3a2f3dbbea136f7c9c2a013892938586d2094cce045a81564046a80a9ba7bfa0f5925b92c3266695a24054235295 SHA512 2201d7a9f01dab71ed53245e9447044d928eb444da952f71aaa366bf27f5e9965e742ea70efd59064ffbc765940445f4b35b7cf5767524379e43a130da0b89fd
 EBUILD icinga2-2.9.1.ebuild 4416 BLAKE2B 0e9e5c307089b8e9feab2ab66468db68e83fd8c7ca54cb4f72dd4405f5ab2879a0a1bb671ddc6abc5638fb2a49cb7f07fc600579889bea1a6fa6540265f7372c SHA512 81ccd2334931c16fed9a5544ace4f8310519c5634437765c7fc9b4ff769def9a7cb717fefb39fc838f7d19f56c5a282f81aad73e8ec5aaa707907266f8d73343
-EBUILD icinga2-2.9.2.ebuild 4739 BLAKE2B 10e76feb6b03018bfdb9409e70c54c6309572eea19bbf57dbadcf6d85ccaea5b93e552d9116ad125adbba79390f6a52d35cc005beea443980739234d51301a59 SHA512 b045c1be0d84f1f7a63a6e8c4a3da4151d50e18d9fc738762efe8a7bc07bf7110c6718b36cc3cf371dfa3184d2a9e01dba58c9964bf6debd0d86f11d76f13b77
 EBUILD icinga2-9999.ebuild 4739 BLAKE2B af9e0e626730fb2514cd38c8decf2308046beffffba6df1e5768593da0941f23a702913af03ca67b0a4034dc59cc7a5f0745fe36903a9bb7c4665a4bd06c1705 SHA512 3f6d8bda9d1f4729d3abf162d1d8d883e7da4310a29d83d8468ced54db64b84caf9c27d2c10b128d2ec8d7aeb9cd654c5416904d8deade3b243ec8a851711f06
 MISC metadata.xml 894 BLAKE2B 45c6d004ea4200544a543c452df876bd89ce3f2143ce5879c671cfc79c31878abb7ce127a350e3149214c3b5b69f5f8a1b75a4c59ac10d7016b4f5023b276646 SHA512 e370c17e46b447f97281616efab16e591b8c6ecfb85896259c2f7cb5ed61a474ccebceaefe5df5eb6885902f518990963324d13b942b3167d73de093499568dd
diff --git a/net-analyzer/icinga2/icinga2-2.10.1-r1.ebuild b/net-analyzer/icinga2/icinga2-2.10.1-r1.ebuild
deleted file mode 100644
index e19f3c3869b0..000000000000
--- a/net-analyzer/icinga2/icinga2-2.10.1-r1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-if [[ ${PV} != 9999 ]]; then
-	inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets
-	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-else
-	inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets
-	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
-	EGIT_BRANCH="master"
-	KEYWORDS=""
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="classicui console libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax"
-WX_GTK_VER="3.0"
-
-CDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	>=dev-libs/boost-1.58-r1
-	console? ( dev-libs/libedit )
-	mariadb? ( dev-db/mariadb-connector-c:= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	postgres? ( dev-db/postgresql:= )
-	dev-libs/yajl"
-
-DEPEND="
-	${CDEPEND}
-	sys-devel/bison
-	>=sys-devel/flex-2.5.35"
-
-RDEPEND="
-	${CDEPEND}
-	plugins? ( || (
-		net-analyzer/monitoring-plugins
-		net-analyzer/nagios-plugins
-	) )
-	mail? ( virtual/mailx )
-	classicui? ( net-analyzer/icinga[web] )"
-
-REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-	enewgroup icinga
-	enewgroup icingacmd
-	enewgroup nagios  # for plugins
-	enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
-}
-
-src_configure() {
-	sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
-	local mycmakeargs=(
-		-DICINGA2_UNITY_BUILD=FALSE
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
-		-DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
-		-DICINGA2_USER=icinga
-		-DICINGA2_GROUP=icingacmd
-		-DICINGA2_COMMAND_GROUP=icingacmd
-		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-		-DUSE_SYSTEMD=$(usex systemd ON OFF)
-		-DLOGROTATE_HAS_SU=ON
-	)
-	# default to off if minimal, allow the flags to be set otherwise
-	if use minimal; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_MYSQL=OFF
-			-DICINGA2_WITH_PGSQL=OFF
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
-			-DICINGA2_WITH_MYSQL=$(usex mysql ON OFF)
-		)
-	fi
-	# LTO
-	if use lto; then
-		mycmakeargs+=(
-			-DICINGA2_LTO_BUILD=ON
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_LTO_BUILD=OFF
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
-	cd "${BUILDDIR}" || die
-
-	emake DESTDIR="${D}" install
-
-	einstalldocs
-
-	newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
-
-	if use mysql ; then
-		docinto schema
-		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
-		docinto schema/upgrade
-		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
-	fi
-	if use mariadb ; then  # same as mysql
-		docinto schema
-		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
-		docinto schema/upgrade
-		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
-	fi
-	if use postgres ; then
-		docinto schema
-		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
-		docinto schema/upgrade
-		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
-	fi
-
-	keepdir /etc/icinga2
-	keepdir /var/lib/icinga2/api/zones
-	keepdir /var/lib/icinga2/api/repository
-	keepdir /var/lib/icinga2/api/log
-	keepdir /var/spool/icinga2/perfdata
-
-	rm -r "${D}/var/run" || die "failed to remove /var/run"
-	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
-
-	fowners root:icinga /etc/icinga2
-	fperms 0750 /etc/icinga2
-	fowners icinga:icinga /var/lib/icinga2
-	fowners icinga:icinga /var/spool/icinga2
-	fowners -R icinga:icingacmd /var/lib/icinga2/api
-	fowners icinga:icinga /var/spool/icinga2/perfdata
-	fowners icinga:icingacmd /var/log/icinga2
-
-	fperms ug+rwX,o-rwx /etc/icinga2
-	fperms ug+rwX,o-rwx /var/lib/icinga2
-	fperms ug+rwX,o-rwx /var/spool/icinga2
-	fperms ug+rwX,o-rwx /var/log/icinga2
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles
-		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
-		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
-	fi
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
-		elog "DB IDO schema upgrade may be required required.
-		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-	fi
-}
diff --git a/net-analyzer/icinga2/icinga2-2.10.2.ebuild b/net-analyzer/icinga2/icinga2-2.10.2.ebuild
index 913217ef694f..e19f3c3869b0 100644
--- a/net-analyzer/icinga2/icinga2-2.10.2.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.10.2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 if [[ ${PV} != 9999 ]]; then
 	inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets
 	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 else
 	inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets
 	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
diff --git a/net-analyzer/icinga2/icinga2-2.9.1-r1.ebuild b/net-analyzer/icinga2/icinga2-2.9.1-r1.ebuild
deleted file mode 100644
index 635111837e4c..000000000000
--- a/net-analyzer/icinga2/icinga2-2.9.1-r1.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-if [[ ${PV} != 9999 ]]; then
-	inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets
-	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-else
-	inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets
-	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
-	EGIT_BRANCH="master"
-	KEYWORDS=""
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins systemd +vim-syntax"
-WX_GTK_VER="3.0"
-
-CDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	>=dev-libs/boost-1.58-r1
-	console? ( dev-libs/libedit )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )
-	dev-libs/yajl"
-
-DEPEND="
-	${CDEPEND}
-	sys-devel/bison
-	>=sys-devel/flex-2.5.35"
-
-RDEPEND="
-	${CDEPEND}
-	plugins? ( || (
-		net-analyzer/monitoring-plugins
-		net-analyzer/nagios-plugins
-	) )
-	mail? ( virtual/mailx )
-	classicui? ( net-analyzer/icinga[web] )"
-
-REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-	enewgroup icinga
-	enewgroup icingacmd
-	enewgroup nagios  # for plugins
-	enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
-}
-
-src_configure() {
-	sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
-	local mycmakeargs=(
-		-DICINGA2_UNITY_BUILD=FALSE
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
-		-DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
-		-DICINGA2_USER=icinga
-		-DICINGA2_GROUP=icingacmd
-		-DICINGA2_COMMAND_GROUP=icingacmd
-		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-		-DUSE_SYSTEMD=$(usex systemd ON OFF)
-		-DLOGROTATE_HAS_SU=ON
-	)
-	# default to off if minimal, allow the flags to be set otherwise
-	if use minimal; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_MYSQL=OFF
-			-DICINGA2_WITH_PGSQL=OFF
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
-			-DICINGA2_WITH_MYSQL=$(usex mysql ON OFF)
-		)
-	fi
-	# LTO
-	if use lto; then
-		mycmakeargs+=(
-			-DICINGA2_LTO_BUILD=ON
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_LTO_BUILD=OFF
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
-	cd "${BUILDDIR}" || die
-
-	emake DESTDIR="${D}" install
-
-	einstalldocs
-
-	newinitd "${FILESDIR}"/icinga2.initd-2 icinga2
-
-	if use mysql ; then
-		docinto schema
-		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
-		docinto schema/upgrade
-		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
-	elif use postgres ; then
-		docinto schema
-		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
-		docinto schema/upgrade
-		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
-	fi
-
-	keepdir /etc/icinga2
-	keepdir /var/lib/icinga2/api/zones
-	keepdir /var/lib/icinga2/api/repository
-	keepdir /var/lib/icinga2/api/log
-	keepdir /var/spool/icinga2/perfdata
-
-	rm -r "${D}/var/run" || die "failed to remove /var/run"
-	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
-
-	fowners root:icinga /etc/icinga2
-	fperms 0750 /etc/icinga2
-	fowners icinga:icinga /var/lib/icinga2
-	fowners icinga:icinga /var/spool/icinga2
-	fowners -R icinga:icingacmd /var/lib/icinga2/api
-	fowners icinga:icinga /var/spool/icinga2/perfdata
-	fowners icinga:icingacmd /var/log/icinga2
-
-	fperms ug+rwX,o-rwx /etc/icinga2
-	fperms ug+rwX,o-rwx /var/lib/icinga2
-	fperms ug+rwX,o-rwx /var/spool/icinga2
-	fperms ug+rwX,o-rwx /var/log/icinga2
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles
-		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
-		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
-	fi
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
-		elog "DB IDO schema upgrade may be required required.
-		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-	fi
-}
diff --git a/net-analyzer/icinga2/icinga2-2.9.2.ebuild b/net-analyzer/icinga2/icinga2-2.9.2.ebuild
deleted file mode 100644
index e5caea793dd7..000000000000
--- a/net-analyzer/icinga2/icinga2-2.9.2.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-if [[ ${PV} != 9999 ]]; then
-	inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets
-	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-else
-	inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets
-	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
-	EGIT_BRANCH="master"
-	KEYWORDS=""
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="classicui console libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax"
-WX_GTK_VER="3.0"
-
-CDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	>=dev-libs/boost-1.58-r1
-	console? ( dev-libs/libedit )
-	mariadb? ( dev-db/mariadb-connector-c:= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	postgres? ( dev-db/postgresql:= )
-	dev-libs/yajl"
-
-DEPEND="
-	${CDEPEND}
-	sys-devel/bison
-	>=sys-devel/flex-2.5.35"
-
-RDEPEND="
-	${CDEPEND}
-	plugins? ( || (
-		net-analyzer/monitoring-plugins
-		net-analyzer/nagios-plugins
-	) )
-	mail? ( virtual/mailx )
-	classicui? ( net-analyzer/icinga[web] )"
-
-REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-	enewgroup icinga
-	enewgroup icingacmd
-	enewgroup nagios  # for plugins
-	enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
-}
-
-src_configure() {
-	sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
-	local mycmakeargs=(
-		-DICINGA2_UNITY_BUILD=FALSE
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
-		-DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
-		-DICINGA2_USER=icinga
-		-DICINGA2_GROUP=icingacmd
-		-DICINGA2_COMMAND_GROUP=icingacmd
-		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-		-DUSE_SYSTEMD=$(usex systemd ON OFF)
-		-DLOGROTATE_HAS_SU=ON
-	)
-	# default to off if minimal, allow the flags to be set otherwise
-	if use minimal; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_MYSQL=OFF
-			-DICINGA2_WITH_PGSQL=OFF
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
-			-DICINGA2_WITH_MYSQL=$(usex mysql ON OFF)
-		)
-	fi
-	# LTO
-	if use lto; then
-		mycmakeargs+=(
-			-DICINGA2_LTO_BUILD=ON
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_LTO_BUILD=OFF
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
-	cd "${BUILDDIR}" || die
-
-	emake DESTDIR="${D}" install
-
-	einstalldocs
-
-	newinitd "${FILESDIR}"/icinga2.initd-2 icinga2
-
-	if use mysql ; then
-		docinto schema
-		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
-		docinto schema/upgrade
-		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
-	fi
-	if use mariadb ; then  # same as mysql
-		docinto schema
-		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
-		docinto schema/upgrade
-		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
-	fi
-	if use postgres ; then
-		docinto schema
-		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
-		docinto schema/upgrade
-		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
-	fi
-
-	keepdir /etc/icinga2
-	keepdir /var/lib/icinga2/api/zones
-	keepdir /var/lib/icinga2/api/repository
-	keepdir /var/lib/icinga2/api/log
-	keepdir /var/spool/icinga2/perfdata
-
-	rm -r "${D}/var/run" || die "failed to remove /var/run"
-	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
-
-	fowners root:icinga /etc/icinga2
-	fperms 0750 /etc/icinga2
-	fowners icinga:icinga /var/lib/icinga2
-	fowners icinga:icinga /var/spool/icinga2
-	fowners -R icinga:icingacmd /var/lib/icinga2/api
-	fowners icinga:icinga /var/spool/icinga2/perfdata
-	fowners icinga:icingacmd /var/log/icinga2
-
-	fperms ug+rwX,o-rwx /etc/icinga2
-	fperms ug+rwX,o-rwx /var/lib/icinga2
-	fperms ug+rwX,o-rwx /var/spool/icinga2
-	fperms ug+rwX,o-rwx /var/log/icinga2
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles
-		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
-		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
-	fi
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
-		elog "DB IDO schema upgrade may be required required.
-		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-	fi
-}
diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index 081cc3812c55..93faf880e626 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -1,6 +1,7 @@
 AUX database.yml 613 BLAKE2B c724103b21f7650e4c6a221a22984cbff1be21ae761b62666db5d048e087f3d4e891e30b75fcacdcb5dc2fc369dd8dff4de042d6b87f47bffffeb45bd05aca46 SHA512 b178724382a88b87b9007f950fb5e8f93936f3e5a58f89c90f67120c4d50c98d4de758c8a6e321a0a68caa12ccab003d502377621bfe762279eb5ae2a3d5ff2b
 DIST metasploit-4.14.16.tar.gz 23726763 BLAKE2B ab2d3f10c948db394643f2bcd9b08822f16133ef81abe7048b6c4e49bf635abded40d7359b9787f7f955ba6eccfdb81ff6372d24dd2acd732ba9f16cb41ca8b4 SHA512 882968e68ff5adf10426f6e8480f3eac7cd9b289c1e641a91e537d31a434858f2c47b4f7b5bf23fcfc22eceecd2527eedb7eac3e9a8ad4a212187762b1b9aab2
-EBUILD metasploit-4.14.16-r1.ebuild 11780 BLAKE2B ffdfc70a91f860a96e7cd3b9c3e77e67ad1662a7feb1e4fa40509ed2778f671aaf5b68c7d5e12c3f646863d65ebbbd1a978eb510403814a2a80c1be150bf5f34 SHA512 ca2fa7835ddab2e7e106409e94ffc406877cf0f7c03b6d4b97c9bb03db0439f511ac35f51e13b5864b1cbc4fc3e37b69a134baaaf026f378e363317a01c84825
-EBUILD metasploit-4.14.16.ebuild 11665 BLAKE2B 37e41d7e070d586ad86328114600fd2906142713244878158f2bc672f12c3197737df61e898812991d83ceec2a47776a19dbea3713da13196a9668c924cbdb26 SHA512 16c7a9ccaa1f001605a8e33fee78a3fc2541950f419396a158012cbee9b41df49aae1d39950ac0b86e008d975915385404820d1c52743b0d87ac7d1677a5f51e
-EBUILD metasploit-9999.ebuild 11578 BLAKE2B 1d1d3580743872eaa8f20031ec0f01159486f4694bce173e75c52b7e961861a2ea60e9463d9b51d4f0080ad34d9875724be0b8d3ca81c603ad2d334d9ab68f54 SHA512 021ffb2749c626adfa7448971cfda65b0f86bc7afab642f5d03492ec846f31fc61a4846804c9efa1164b45d265cd436363c5c58b264f1329e75cc4241944cf48
+DIST metasploit-4.17.21.tar.gz 28812125 BLAKE2B 15ff8ccac99d783b7b9cd20d6512df551b3143b4947d2f347b2558d1bafd2861d41fe6b051034c75cd25030ad85d26f261ffe9149dd27d551f92f17fcc0b4075 SHA512 00763f515bc6b556d4dbe15a7c58fac3c7febb64fb339fd5c05ad2b18b5b55bdf8815daca35f24bb22bea3d376db4f4610918730d813079e5ac3f8d5ad16d2d9
+EBUILD metasploit-4.14.16-r2.ebuild 11790 BLAKE2B 8b2fb60ffa9bf4636f4c0cbd25802fa531339d4e439478118fbef1fd2b411095544984195bccf69100049ecdca7f7e276e2f79ca489d953e2a597f9ce6cfde34 SHA512 a9a189b1d3eef0054aa63628b16b51a5c16be4861b12afae2442083cffbc37e3e18fd8ed0955d4e9190fefe0c72417b4623aca17a68c35d363097eeb4dcfaf17
+EBUILD metasploit-4.17.21-r4.ebuild 12232 BLAKE2B 6634d2be9375e19e5048ced4801f55424ac143b46b1675be8040230ee51a586e6512821509ad00dcb841411ebe715615ee8ec36715d14e1b17a1fa68206a767a SHA512 abbb8fa6cb57158bd38457456d3b63d5bf2f1a8aa2bef5a7512492bebc1174cf1572f0250801f6a954ae3f717542b864ae029993fa4581ec92c20379a9af0940
+EBUILD metasploit-9999.ebuild 12233 BLAKE2B 43593e3349db4932a2c4808be403b07e4dceb79abdad407a3285a515f31209ddddbeddf371822fc71156f99c1dae3dbbee8423d776370926a6108adcafa4dcce SHA512 eea4237aaaf6a6c36f6df83a1b4475126797c3fa2c2c5758042e28079b46637e56e0b509abe28eaa149029dd5db683111773d479c59c972b4b4f1d258483e799
 MISC metadata.xml 853 BLAKE2B 9b0b2e6c82a4df1327ded8b8381fa1e557ba4353ae5dab9665e7b59950d36e61faead5d8672e2cc10dad68b5a3250126a7fb1c4edc7f6814f28ea3f6df663473 SHA512 9af2dae0c12ae84ae2a7887fad0e7f5ea1d945a8b6e6674ba9e3c3bbff167b00a4aeff2da8b457ff8657f83d617dad67f633b260578a1e9608475fe45585cad0
diff --git a/net-analyzer/metasploit/metasploit-4.14.16-r1.ebuild b/net-analyzer/metasploit/metasploit-4.14.16-r2.ebuild
index 1609560a6419..fb8f4c563b88 100644
--- a/net-analyzer/metasploit/metasploit-4.14.16-r1.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.14.16-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -19,8 +19,8 @@ else
 	SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm"
 	RUBY_S="${PN}-framework-${MY_PV}"
-	inherit versionator
-	SLOT="$(get_version_component_range 1).$(get_version_component_range 2)"
+	inherit eapi7-ver
+	SLOT="$(ver_cut 1).$(ver_cut 2)"
 fi
 
 DESCRIPTION="Advanced framework for developing, testing, and using vulnerability exploit code"
@@ -40,8 +40,8 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/bit-struct
 	>=dev-ruby/builder-3.0
 	dev-ruby/bundler
-	dev-ruby/filesize
-	>=dev-ruby/jsobfu-0.3.0
+	dev-ruby/filesize:*
+	>=dev-ruby/jsobfu-0.3.0:*
 	dev-ruby/json:*
 	dev-ruby/kissfft
 	dev-ruby/metasm:1.0.2
@@ -79,9 +79,9 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/rex-struct2
 	dev-ruby/rex-text
 	dev-ruby/rex-zip
-	dev-ruby/ruby_smb
+	dev-ruby/ruby_smb:*
 	dev-ruby/sqlite3
-	>=dev-ruby/pg-0.11
+	>=dev-ruby/pg-0.11:*
 	dev-ruby/packetfu:1.1.13
 	>=dev-ruby/rubyzip-1.1
 	>=dev-ruby/rb-readline-0.5.4
@@ -115,7 +115,7 @@ ruby_add_bdepend "${RUBY_COMMON_DEPEND}
 ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
 
 COMMON_DEPEND="dev-db/postgresql[server]
-	>=app-crypt/johntheripper-1.7.9-r1[-minimal]
+	|| ( app-crypt/johntheripper-jumbo >=app-crypt/johntheripper-1.7.9-r1[-minimal] )
 	net-analyzer/nmap"
 RDEPEND+=" ${COMMON_DEPEND}
 	>=app-eselect/eselect-metasploit-0.16"
@@ -300,7 +300,7 @@ all_ruby_install() {
 	# do not remove LICENSE, bug #238137
 	dodir /usr/share/doc/${PF}
 	cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die
-	dosym /usr/share/doc/${PF}/documentation /usr/$(get_libdir)/${PN}${SLOT}/documentation
+	ln -s "../../share/doc/${PF}/documentation" "${ED}/usr/$(get_libdir)/${PN}${SLOT}/documentation"
 
 	fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate
 
diff --git a/net-analyzer/metasploit/metasploit-4.14.16.ebuild b/net-analyzer/metasploit/metasploit-4.17.21-r4.ebuild
index 5057b32c61ab..9c5d8872886b 100644
--- a/net-analyzer/metasploit/metasploit-4.14.16.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.17.21-r4.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 #never ever ever have more than one ruby in here
-USE_RUBY="ruby23"
+USE_RUBY="ruby24"
 inherit eutils ruby-ng
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/rapid7/metasploit-framework.git"
+	EGIT_BRANCH="4.x"
 	EGIT_CHECKOUT_DIR="${WORKDIR}"/all
 	inherit git-r3
 	KEYWORDS=""
@@ -17,10 +18,10 @@ else
 	##Tags https://github.com/rapid7/metasploit-framework/releases
 	MY_PV=${PV/_p/-}
 	SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
+	KEYWORDS="~amd64 ~x86"
 	RUBY_S="${PN}-framework-${MY_PV}"
-	inherit versionator
-	SLOT="$(get_version_component_range 1).$(get_version_component_range 2)"
+	inherit eapi7-ver
+	SLOT="$(ver_cut 1).$(ver_cut 2)"
 fi
 
 DESCRIPTION="Advanced framework for developing, testing, and using vulnerability exploit code"
@@ -32,35 +33,43 @@ IUSE="development +java nexpose openvas oracle +pcap test"
 #http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible)
 RESTRICT="test"
 
+#grep spec.add_runtime_dependency metasploit-framework.gemspec | sort
 RUBY_COMMON_DEPEND="virtual/ruby-ssl
-	>=dev-ruby/activesupport-4.2.6:4.2
 	>=dev-ruby/actionpack-4.2.6:4.2
 	>=dev-ruby/activerecord-4.2.6:4.2
+	>=dev-ruby/activesupport-4.2.6:4.2
+	dev-ruby/backports
 	dev-ruby/bcrypt-ruby
+	dev-ruby/bcrypt_pbkdf
 	dev-ruby/bit-struct
-	>=dev-ruby/builder-3.0
 	dev-ruby/bundler
-	dev-ruby/filesize
-	>=dev-ruby/jsobfu-0.3.0
+	dev-ruby/dnsruby
+	dev-ruby/faker
+	dev-ruby/filesize:*
+	dev-ruby/jsobfu:*
 	dev-ruby/json:*
-	dev-ruby/kissfft
-	dev-ruby/metasm:1.0.2
-	>=dev-ruby/metasploit_data_models-2.0.0
-	dev-ruby/meterpreter_bins:0.0.22
-	dev-ruby/metasploit-payloads:1.2.24
-	dev-ruby/metasploit_payloads-mettle:0.1.9
-	>=dev-ruby/metasploit-credential-2.0.0
-	>=dev-ruby/metasploit-concern-2.0.0
-	>=dev-ruby/metasploit-model-2.0.0
+	dev-ruby/metasm:*
+	dev-ruby/metasploit-concern
+	<dev-ruby/metasploit-credential-3.0.0
+	<dev-ruby/metasploit_data_models-3.0.0
+	dev-ruby/metasploit-model
+	dev-ruby/metasploit-payloads:1.3.53
+	dev-ruby/metasploit_payloads-mettle:0.4.2
+	dev-ruby/mqtt
 	dev-ruby/msgpack
 	dev-ruby/net-ssh:*
+	dev-ruby/ed25519
 	dev-ruby/nokogiri
 	dev-ruby/octokit
 	dev-ruby/openssl-ccm:1.2.1
+	dev-ruby/packetfu:1.1.13
 	dev-ruby/patch_finder
-	>=dev-ruby/recog-2.0.14
+	dev-ruby/pdf-reader:*
+	~dev-ruby/pg-0.21.0
+	dev-ruby/railties:*
+	dev-ruby/rb-readline
+	dev-ruby/recog:*
 	dev-ruby/redcarpet
-	>=dev-ruby/rkelly-remix-0.0.6
 	dev-ruby/rex-arch
 	dev-ruby/rex-bin_tools
 	dev-ruby/rex-core
@@ -70,25 +79,24 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/rex-mime
 	dev-ruby/rex-nop
 	dev-ruby/rex-ole
-	dev-ruby/rex-powershell
+	<dev-ruby/rex-powershell-0.1.78
 	dev-ruby/rex-random_identifier
 	dev-ruby/rex-registry
+	dev-ruby/rex-rop_builder
 	dev-ruby/rex-socket
 	dev-ruby/rex-sslscan
-	dev-ruby/rex-rop_builder
 	dev-ruby/rex-struct2
 	dev-ruby/rex-text
 	dev-ruby/rex-zip
-	dev-ruby/ruby_smb
+	dev-ruby/ruby-macho
+	dev-ruby/rubyntlm
+	dev-ruby/ruby_smb:*
+	dev-ruby/rubyzip
 	dev-ruby/sqlite3
-	>=dev-ruby/pg-0.11
-	dev-ruby/packetfu:1.1.13
-	>=dev-ruby/rubyzip-1.1
-	>=dev-ruby/rb-readline-0.5.4
-	dev-ruby/robots
 	dev-ruby/sshkey
 	dev-ruby/tzinfo:*
 	dev-ruby/windows_error
+	dev-ruby/xdr:2.0.0
 	dev-ruby/xmlrpc
 	java? ( dev-ruby/rjb )
 	nexpose? ( dev-ruby/nexpose )
@@ -115,7 +123,7 @@ ruby_add_bdepend "${RUBY_COMMON_DEPEND}
 ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
 
 COMMON_DEPEND="dev-db/postgresql[server]
-	>=app-crypt/johntheripper-1.7.9-r1[-minimal]
+	|| ( app-crypt/johntheripper-jumbo >=app-crypt/johntheripper-1.7.9-r1[-minimal] )
 	net-analyzer/nmap"
 RDEPEND+=" ${COMMON_DEPEND}
 	>=app-eselect/eselect-metasploit-0.16"
@@ -138,9 +146,14 @@ QA_PREBUILT="
 	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
 	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
 	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf
+	usr/lib*/${PN}${SLOT}/data/exploits/mysql/lib_mysqludf_sys_32.so
+	usr/lib*/${PN}${SLOT}/data/exploits/*
 	usr/lib*/${PN}${SLOT}/data/android/libs/x86/libndkstager.so
 	usr/lib*/${PN}${SLOT}/data/android/libs/mips/libndkstager.so
 	usr/lib*/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux_dll.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux_dll.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_aarch64_linux.bin
 	"
 
 pkg_setup() {
@@ -185,6 +198,9 @@ all_ruby_prepare() {
 	sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die
 	#use released packetfu
 	sed -i "s/1.1.13.pre/1.1.13/" metasploit-framework.gemspec || die
+	#use the stable pg
+	#https://github.com/rapid7/metasploit-framework/issues/10234
+	sed -i "s/dependency 'pg', '0.20.0'/dependency 'pg', '0.21.0'/" metasploit-framework.gemspec || die
 	#git gems are only for ruby24 support and we are not there yet
 	sed -i "/git:/d" Gemfile || die
 
@@ -286,9 +302,9 @@ each_ruby_install() {
 
 	#I'm 99% sure that this will only work for as long as we only support one ruby version.  Creativity will be needed if we wish to support multiple.
 	# should be as simple as copying everything into the target...
-	dodir /usr/$(get_libdir)/${PN}${SLOT}
-	cp -R * "${ED}"/usr/$(get_libdir)/${PN}${SLOT} || die "Copy files failed"
-	rm -Rf "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/documentation "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/README.md
+	dodir /usr/lib/${PN}${SLOT}
+	cp -R * "${ED}"/usr/lib/${PN}${SLOT} || die "Copy files failed"
+	rm -Rf "${ED}"/usr/lib/${PN}${SLOT}/documentation "${ED}"/usr/lib${PN}${SLOT}/README.md
 	fowners -R root:0 /
 
 }
@@ -297,16 +313,16 @@ all_ruby_install() {
 	# do not remove LICENSE, bug #238137
 	dodir /usr/share/doc/${PF}
 	cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die
-	dosym /usr/share/doc/${PF}/documentation /usr/$(get_libdir)/${PN}${SLOT}/documentation
+	ln -s "../../share/doc/${PF}/documentation" "${ED}/usr/lib/${PN}${SLOT}/documentation"
 
-	fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate
+	fperms +x /usr/lib/${PN}${SLOT}/msfupdate
 
 	#tell revdep-rebuild to ignore binaries meant for the target
 	dodir /etc/revdep-rebuild
 	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-metasploit${SLOT}
 		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
-		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/meterpreter"
-		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/exploits"
+		SEARCH_DIRS_MASK="/usr/lib/${PN}${SLOT}/data/meterpreter"
+		SEARCH_DIRS_MASK="/usr/lib/${PN}${SLOT}/data/exploits"
 	EOF
 }
 
diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 3f4e20c9c000..dbc324bc0ec4 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 #never ever ever have more than one ruby in here
-USE_RUBY="ruby23"
+USE_RUBY="ruby24"
 inherit eutils ruby-ng
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/rapid7/metasploit-framework.git"
+	EGIT_BRANCH="4.x"
 	EGIT_CHECKOUT_DIR="${WORKDIR}"/all
 	inherit git-r3
 	KEYWORDS=""
@@ -17,10 +18,10 @@ else
 	##Tags https://github.com/rapid7/metasploit-framework/releases
 	MY_PV=${PV/_p/-}
 	SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~x86"
 	RUBY_S="${PN}-framework-${MY_PV}"
-	inherit versionator
-	SLOT="$(get_version_component_range 1).$(get_version_component_range 2)"
+	inherit eapi7-ver
+	SLOT="$(ver_cut 1).$(ver_cut 2)"
 fi
 
 DESCRIPTION="Advanced framework for developing, testing, and using vulnerability exploit code"
@@ -32,35 +33,43 @@ IUSE="development +java nexpose openvas oracle +pcap test"
 #http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible)
 RESTRICT="test"
 
+#grep spec.add_runtime_dependency metasploit-framework.gemspec | sort
 RUBY_COMMON_DEPEND="virtual/ruby-ssl
-	>=dev-ruby/activesupport-4.2.6:4.2
 	>=dev-ruby/actionpack-4.2.6:4.2
 	>=dev-ruby/activerecord-4.2.6:4.2
+	>=dev-ruby/activesupport-4.2.6:4.2
+	dev-ruby/backports
 	dev-ruby/bcrypt-ruby
+	dev-ruby/bcrypt_pbkdf
 	dev-ruby/bit-struct
-	>=dev-ruby/builder-3.0
 	dev-ruby/bundler
-	dev-ruby/filesize
-	>=dev-ruby/jsobfu-0.3.0
+	dev-ruby/dnsruby
+	dev-ruby/faker
+	dev-ruby/filesize:*
+	dev-ruby/jsobfu:*
 	dev-ruby/json:*
-	dev-ruby/kissfft
-	dev-ruby/metasm:1.0.2
-	>=dev-ruby/metasploit_data_models-2.0.0
-	dev-ruby/meterpreter_bins:0.0.22
-	dev-ruby/metasploit-payloads:1.2.28
-	dev-ruby/metasploit_payloads-mettle:0.1.9
-	>=dev-ruby/metasploit-credential-2.0.0
-	>=dev-ruby/metasploit-concern-2.0.0
-	>=dev-ruby/metasploit-model-2.0.0
+	dev-ruby/metasm:*
+	dev-ruby/metasploit-concern
+	<dev-ruby/metasploit-credential-3.0.0
+	<dev-ruby/metasploit_data_models-3.0.0
+	dev-ruby/metasploit-model
+	dev-ruby/metasploit-payloads:1.3.53
+	dev-ruby/metasploit_payloads-mettle:0.4.2
+	dev-ruby/mqtt
 	dev-ruby/msgpack
 	dev-ruby/net-ssh:*
+	dev-ruby/ed25519
 	dev-ruby/nokogiri
 	dev-ruby/octokit
 	dev-ruby/openssl-ccm:1.2.1
+	dev-ruby/packetfu:1.1.13
 	dev-ruby/patch_finder
-	>=dev-ruby/recog-2.0.14
+	dev-ruby/pdf-reader:*
+	~dev-ruby/pg-0.21.0
+	dev-ruby/railties:*
+	dev-ruby/rb-readline
+	dev-ruby/recog:*
 	dev-ruby/redcarpet
-	>=dev-ruby/rkelly-remix-0.0.6
 	dev-ruby/rex-arch
 	dev-ruby/rex-bin_tools
 	dev-ruby/rex-core
@@ -70,25 +79,24 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/rex-mime
 	dev-ruby/rex-nop
 	dev-ruby/rex-ole
-	dev-ruby/rex-powershell
+	<dev-ruby/rex-powershell-0.1.78
 	dev-ruby/rex-random_identifier
 	dev-ruby/rex-registry
+	dev-ruby/rex-rop_builder
 	dev-ruby/rex-socket
 	dev-ruby/rex-sslscan
-	dev-ruby/rex-rop_builder
 	dev-ruby/rex-struct2
 	dev-ruby/rex-text
 	dev-ruby/rex-zip
-	dev-ruby/ruby_smb
+	dev-ruby/ruby-macho
+	dev-ruby/rubyntlm
+	dev-ruby/ruby_smb:*
+	dev-ruby/rubyzip
 	dev-ruby/sqlite3
-	>=dev-ruby/pg-0.11
-	dev-ruby/packetfu:1.1.13
-	>=dev-ruby/rubyzip-1.1
-	>=dev-ruby/rb-readline-0.5.4
-	dev-ruby/robots
 	dev-ruby/sshkey
 	dev-ruby/tzinfo:*
 	dev-ruby/windows_error
+	dev-ruby/xdr:2.0.0
 	dev-ruby/xmlrpc
 	java? ( dev-ruby/rjb )
 	nexpose? ( dev-ruby/nexpose )
@@ -115,7 +123,7 @@ ruby_add_bdepend "${RUBY_COMMON_DEPEND}
 ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
 
 COMMON_DEPEND="dev-db/postgresql[server]
-	>=app-crypt/johntheripper-1.7.9-r1[-minimal]
+	|| ( app-crypt/johntheripper-jumbo >=app-crypt/johntheripper-1.7.9-r1[-minimal] )
 	net-analyzer/nmap"
 RDEPEND+=" ${COMMON_DEPEND}
 	>=app-eselect/eselect-metasploit-0.16"
@@ -138,9 +146,14 @@ QA_PREBUILT="
 	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
 	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
 	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf
+	usr/lib*/${PN}${SLOT}/data/exploits/mysql/lib_mysqludf_sys_32.so
+	usr/lib*/${PN}${SLOT}/data/exploits/*
 	usr/lib*/${PN}${SLOT}/data/android/libs/x86/libndkstager.so
 	usr/lib*/${PN}${SLOT}/data/android/libs/mips/libndkstager.so
 	usr/lib*/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux_dll.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux_dll.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_aarch64_linux.bin
 	"
 
 pkg_setup() {
@@ -180,8 +193,14 @@ all_ruby_prepare() {
 	#Gemfile.lock contains the versions tested by the msf team but not the hard requirements
 	#we regen this file in each_ruby_prepare
 	rm Gemfile.lock
+
 	#The Gemfile contains real known deps
 	sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die
+	#use released packetfu
+	sed -i "s/1.1.13.pre/1.1.13/" metasploit-framework.gemspec || die
+	#use the stable pg
+	#https://github.com/rapid7/metasploit-framework/issues/10234
+	sed -i "s/dependency 'pg', '0.20.0'/dependency 'pg', '0.21.0'/" metasploit-framework.gemspec || die
 	#git gems are only for ruby24 support and we are not there yet
 	sed -i "/git:/d" Gemfile || die
 
@@ -283,9 +302,9 @@ each_ruby_install() {
 
 	#I'm 99% sure that this will only work for as long as we only support one ruby version.  Creativity will be needed if we wish to support multiple.
 	# should be as simple as copying everything into the target...
-	dodir /usr/$(get_libdir)/${PN}${SLOT}
-	cp -R * "${ED}"/usr/$(get_libdir)/${PN}${SLOT} || die "Copy files failed"
-	rm -Rf "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/documentation "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/README.md
+	dodir /usr/lib/${PN}${SLOT}
+	cp -R * "${ED}"/usr/lib/${PN}${SLOT} || die "Copy files failed"
+	rm -Rf "${ED}"/usr/lib/${PN}${SLOT}/documentation "${ED}"/usr/lib/${PN}${SLOT}/README.md
 	fowners -R root:0 /
 
 }
@@ -294,16 +313,16 @@ all_ruby_install() {
 	# do not remove LICENSE, bug #238137
 	dodir /usr/share/doc/${PF}
 	cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die
-	dosym /usr/share/doc/${PF}/documentation /usr/$(get_libdir)/${PN}${SLOT}/documentation
+	ln -s "../../share/doc/${PF}/documentation" "${ED}/usr/lib/${PN}${SLOT}/documentation"
 
-	fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate
+	fperms +x /usr/lib/${PN}${SLOT}/msfupdate
 
 	#tell revdep-rebuild to ignore binaries meant for the target
 	dodir /etc/revdep-rebuild
 	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-metasploit${SLOT}
 		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
-		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/meterpreter"
-		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/exploits"
+		SEARCH_DIRS_MASK="/usr/lib/${PN}${SLOT}/data/meterpreter"
+		SEARCH_DIRS_MASK="/usr/lib/${PN}${SLOT}/data/exploits"
 	EOF
 }
 
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 266d7e275a0f..b764f7d34b48 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -19,7 +19,7 @@ DIST munin-2.0.38.tar.gz 2253625 BLAKE2B 10e4c1f9fb846fd30491c00c5be19d627ae97b0
 DIST munin-2.0.43-gentoo-1.tar.xz 4288 BLAKE2B 4b8695c8800712d07474aac3057041c03c63226a7569895d8ff5587592d0d7cdfaf808675ecf08a47c1986a2d8f8cb220091ce680aa87e1e4b7b5f88c806b258 SHA512 ebcd44d9385c799514ac930790928052692ab0f71bc4a641899fa9b6458e083b7f16230a95f703c5b0e2848ab6879e79a1e77f165fcd880c91e4581aafa336aa
 DIST munin-2.0.43.tar.gz 2264931 BLAKE2B 92f2e13517a725303fe2569e65539b432822aa713c663a9974b9fba62db02a3606d0c56240e4e9d108a9f1aaa2ed3fcd9622387aa9b28eccc28356aee2e28777 SHA512 c01448e51aceafd8330e815c11fe63458768b48209edbffad983cffeff2b46f6eef8726792793485d491be9530dacb0bce11abeb2664e01541c73a77c9fd360c
 EBUILD munin-2.0.34.ebuild 12222 BLAKE2B 2a807d7d83ae99af03812a00bebb78d6089a4a94f7fae417b99afa0b07a0ea53ec633334b682c839ee018bb56b6b8e6fb043ec038930bcd89fa04e151f22d70d SHA512 20b6ee28055cb652d231046d1725ca75160d274b41da1fbc9e67bdbe276948013a7376ca9563b3dac71195f4cbd460644db1db0daa00f89c8302603976553a9c
-EBUILD munin-2.0.38.ebuild 12297 BLAKE2B 012b21a48257d59999ec27e985825c99512854d305a5becf9ad390d380655e2b679b85f6758fdbef6a6a3f43b4a5646af865ee5753d92cb1cec2b862f50521c6 SHA512 8e09ad8e1e8844c30c8d9ac73f182053899365b986ffcb3be2947f484dcdecf459a0b0a58df717490740bb87019fee83880858216a6a3d2c7eb91bcba4a323d7
-EBUILD munin-2.0.43.ebuild 12245 BLAKE2B bf1f615ea9e351f752283ae79ae4226bea23b388fd6cb34866b7595b86b8a4417628a578b304cd2ef263c35d82c34a5ac4470091b6ec962578de8773aff93935 SHA512 020104a1802bdeb60ae9423d402b0dd2bfdad3df8b84c6b348d94bb1af35c1366a7785d28224dce76d23d8c75c5a99ab94b46500474e997b2c0020c58cf5c0fc
+EBUILD munin-2.0.38.ebuild 12317 BLAKE2B b6ff588ee1677a7c4224f7c9bc11701fd3b6c4c1384644254ca75a9e30a885222eaae96344415b773311d70e17443043e573ef7fa1f38fd16358acd452dee614 SHA512 a536fd709bf2bec938551eeba84054b9a8b7a12e82ec9c2abc75f81463871c8809e6d97cfe5dd0e265d2bcd3faf25c1dc438d6fb7ded527cd2ad4437733bc7eb
+EBUILD munin-2.0.43.ebuild 12271 BLAKE2B e1c883585d3e0385ea3c26e4eaa192bca79375416c71cb05f638ead5e553c75df9e9f8fb21725ec80f1dd6fb3a02749cc73a9e59fe918762ea1063ee19ed9f93 SHA512 2dc47464b3a1a0f437e8cf9d6794ee5587306b44e522217db2df2bf483ed1e1cb9909a7d21141c19cb27ec8145492303c1ec50b09f1c7cc919d4c94da4054fb6
 EBUILD munin-2.1.9999.ebuild 11520 BLAKE2B 7f55a4e139ddb37419299ff65fbda91e22a3e890c86c23bc7d83f902fdc81f36ad665d3f0c6d7bbfdb60684740e1ae86ec9ec9f34dbf15f49e5385c72156fa55 SHA512 6069e6d31b9385885e98e815d4bf33227689fa8e74c48f4aa7b6af673be76d25ef26e777ef819563a8978a3cd73bc518b0ad3e5807c58a5b0e575aeb712f5ce5
 MISC metadata.xml 4116 BLAKE2B 652f8bb067b024f91b3f2fb9d885c93405ccd3e4fdfa141ae5e2996f9898e757d7be93d7e74d027a82403d2b9b472f7c6fec95815b18a0b2975e20e328fb7862 SHA512 ecfa257040277d815c05693724e9ff454b5ddefc1134b6afb38d66783a5e415aae78bdb35aeb0e80882a7b8ff19499f2b3b3646cc2a139e7797a0a718c2389f3
diff --git a/net-analyzer/munin/munin-2.0.38.ebuild b/net-analyzer/munin/munin-2.0.38.ebuild
index 1659f7a892a5..25d031a02c76 100644
--- a/net-analyzer/munin/munin-2.0.38.ebuild
+++ b/net-analyzer/munin/munin-2.0.38.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ppc x86"
 IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
 REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
 
@@ -83,6 +83,7 @@ DEPEND="${DEPEND_COM}
 	java? ( >=virtual/jdk-1.5 )
 	test? (
 		dev-perl/Test-Deep
+		dev-perl/Test-Exception
 		dev-perl/Test-LongString
 		dev-perl/Test-Differences
 		dev-perl/Test-MockModule
diff --git a/net-analyzer/munin/munin-2.0.43.ebuild b/net-analyzer/munin/munin-2.0.43.ebuild
index 0b560be539f0..f62ac42c05b1 100644
--- a/net-analyzer/munin/munin-2.0.43.ebuild
+++ b/net-analyzer/munin/munin-2.0.43.ebuild
@@ -83,6 +83,7 @@ DEPEND="${DEPEND_COM}
 	java? ( >=virtual/jdk-1.5 )
 	test? (
 		dev-perl/Test-Deep
+		dev-perl/Test-Exception
 		dev-perl/Test-LongString
 		dev-perl/Test-Differences
 		dev-perl/Test-MockModule
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 06a6d6e2f51a..18c2c27e6e2e 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -2,15 +2,9 @@ AUX 99_nagios4.conf 368 BLAKE2B 147f4b73bd2f7d71dabb56f646399b939d3a87c288efed9b
 AUX lighttpd_nagios4.conf 325 BLAKE2B f89b9d5aed8305d54f76adf29c65ba20bee74b6c82d149c8b0a786dddacc58c62337072691136c486d4050d1e3bce82420398d5f525ebc0bb36eefdf3a6a2e7f SHA512 a2f854713512ee8ee5c451235beb6ffccf2e04617a98619c6de807a5abca0a424e0581c34b4d255dcbc108e677e18bed25dd33e3d38df8fe10d7d8d4fab015c9
 AUX nagios-4.4.2-pre.patch 7936 BLAKE2B 143d1d80ae6d940165f5bff8e27deaee216f2a06b465968060b5a29da79ef2ec5277f3484c9b0774ad62284740b8513571e4df574c82acd03db341b6d5984d80 SHA512 0aa946192ab5f24b22f5c0737d8e2f5764317ee5e1ceab9d9c97b43eb2a4f3a8856c370d3a26d91ea9727b4e17f77876e790e399bf67a01eef3221c116a4558c
 AUX nagios-4.4.3-pre.patch 1479 BLAKE2B cc3f4b1e04f82ec97c5b15e7cb15defb7d700d776ee4faf0123d74afac998b8897796f77924e30e3dd1999d48f15b112481dd4bac4a6d5f5f01774881aad3b3c SHA512 fea7837f745efb85e64450b6cf3795cb011d3d5cf4d70e1e51b5037474f09943d94e2216839d9290fa8507176b14794c1028fd26d2c84f3259e728a3dcbca994
-DIST nagios-4.3.3.tar.gz 11101531 BLAKE2B 537d49ecf28b457fbc1e24eaaa9c5d9e8c4db59ed69c91a573c0cacb6cfb6fd2d52c31e87c0cef34b81a69247bb5b9513983d95e7eae3ea7f861742da485d2d4 SHA512 588292a95342cb2d95d7b58f70442b82b99a23dd9fdc1390e9ae0743626a047e5127d77b1d7e6a1d8edd6f34a425e581bcd42459b673a0ddea14125bde4b7d9e
 DIST nagios-4.3.4.tar.gz 11101966 BLAKE2B 6cb8182f40a4f83875c94df040bb1c62ce078d4130e10fa8595ea0b14cf715fc2a237ffb34199da9c1528e4789f3ce8deae3d993b5b795ad712d48b1e5fdb820 SHA512 f4e92aa98151739442a225a245871d93b5560d89510bdacb1a615959b9687f7a92675f10fcba71078b104ca8f237b0155a9261d67ec66f80aec7f033b4b3e316
-DIST nagios-4.4.0.tar.gz 11295727 BLAKE2B f89e7934b13814ec8c0ae7a19f14eed8842c7b0044fb2812f1399f27a82e5a639b63cc53f04b58ae99aa87bf595b2e25642ad3eb134a041e39f744919bd46d2f SHA512 8c136463133cf26c756ccd39b158ed417297e30f8a0b12d063a4dba6a43f126b27bb5f7ea962c8cde9fb9c1fd8d3439d7cfeaab833045315a9800c993fa0676f
-DIST nagios-4.4.1.tar.gz 11296403 BLAKE2B fdbaec5f913d18d5591f44cd1e0622b9741d7415b591f24f1521f2897b8a1bdbff00e9378ef6b3a6a99ab8d639960abd3d734fd66b665ea88ea1de169b552ace SHA512 d84f22a8fd21a573b4162f232c3a6bb2ba0b7d3a470e5fd80183a1862d2ae666956cfc2dd4c7fe6319ee7ccedb9f8a6920ba39a6b499ed9ff5b8be60a9779fa9
 DIST nagios-4.4.2.tar.gz 11301454 BLAKE2B 1b5ffa775bbf147e96d07edd36a387db271802d58cc1a1d1eb867645955aec0044e757785578a60c12549bd4e66e4c95ef06dd0f3f8be3599187d0ef0bcc8a4b SHA512 a6ddb2d8ca1c523d02659a2af0b9c67a3802893c946279bb15be53645dc64c997cd5562b77eab9dae03e756ec6622a9a641f7bd68269aba4ddd56ee21f50959e
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766
-EBUILD nagios-core-4.3.3.ebuild 7459 BLAKE2B 24b655f0309a5b3793ded3d70110cbb2fd181834ca07673efca032d51a327b6522225f38a7feb57e542bf306ef86cb228d8e45bf4368cf237782ed60ed73748c SHA512 e00da7ae2a31559ff1510bd76117392014ea949db0a90575e1cc75f58ade9e481ace47afce06535d6684ff5a6e0e1de1149f53141b2c436a55abbf23d3dd503c
 EBUILD nagios-core-4.3.4.ebuild 6633 BLAKE2B b179113b24ff38a5c147de20cd48db21fa1379f4ab377c7c354a1f107f9651f1b348f7dbd26825aaacb1fe8ce54d8feedbd7a44b65d3c897480d1c87a1fd4183 SHA512 43668b229464870ff2843790b1fd3bed7e3e2c4ba58f8cc19b90d8e85418c0e86b3b604089ccf52a63f24f6c0fb5e9ea4045769b2f63df96dc7d70c53d3e8411
-EBUILD nagios-core-4.4.0.ebuild 6641 BLAKE2B 1264cb8277e44b047418073c7808c4b99d865ebcd3ffd92f7c030703e8a04d2ef7c8aff89a3191d8cda4c5aa903297b6c7a83c6b354cd4c3956ce9ee107d1e5a SHA512 5bc7f701186cc0fc6869e606bd831fd66fe466865ec68144235a0d62ab8ae2c3893ba467201140b82e91d4e8e8ef615924b5a766a8a9507a3f8d2239e7f33456
-EBUILD nagios-core-4.4.1.ebuild 6692 BLAKE2B 74b0316cb39b05736af99112c2cd7d41733f9089d7826f1a808e79860dc5ae8dde4c23f69dc69c798c528f3ed53740c4eee01e97a1c58e965e0c919964c9b5c4 SHA512 cd8b77093fd231a531c432d51c1971b4c2018b8b3829648fc2ee32f7a2a5b3c1de5139f52e61f967c1558fcebc9fa9661f60eb6c8d78b3e8218be4379882a7a4
 EBUILD nagios-core-4.4.2.ebuild 6692 BLAKE2B cef816faef6561bb8ee0dae09266fb0fce684ac0d6e2c65227e0e6aa2080bf20ff4612e189d269f66c946de516dd7620820f9acc76d6cbb89380dbda1d552a0d SHA512 26524450d6a3c207d5d05562767f635f04828f19e7d065ab2e0a826b5c82c444811d344cc3380bee814d2369451a82423aab4047feadae84077e97c1b1130963
 MISC metadata.xml 1466 BLAKE2B 655e382c72b7fcf8f4283055a503e2ad79dbfc695f730980543e6a7381f5aa093ab279341cd2df19a1d5e5053b2c686ecf6884c541a7b984dce60fc1ae4d4599 SHA512 51f819fc2cbe3b87ee96b048fd0e622f78673a29d5b42b2b8f1d963f6f71ead679b057863f5f1a56e997c1e19ff26edf52697c02f79ba89ed6a5480d0ae2296b
diff --git a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
deleted file mode 100644
index 11e40c1b8e02..000000000000
--- a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs user
-
-MY_P=${PN/-core}-${PV}
-DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
-HOMEPAGE="https://www.nagios.org/"
-
-# The name of the directory into which our Gentoo icons will be
-# extracted, and also the basename of the archive containing it.
-GENTOO_ICONS="${PN}-gentoo-icons-20141125"
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
-	web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86"
-IUSE="apache2 classicui lighttpd perl +web vim-syntax"
-
-# In pkg_postinst(), we change the group of the Nagios configuration
-# directory to that of the web server user. It can't belong to both
-# apache/lighttpd groups at the same time, so we block this combination
-# for our own sanity.
-#
-# This could be made to work, but we would need a better way to allow
-# the web user read-only access to Nagios's configuration directory.
-#
-REQUIRED_USE="apache2? ( !lighttpd )"
-
-# sys-devel/libtool dependency is bug #401237.
-#
-# Note, we require one of the apache2 CGI modules:
-#
-#   * mod_cgi
-#   * mod_cgid
-#   * mod_fcgid
-#
-# We just don't care /which/ one. And of course PHP supports both CGI
-# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
-# dependencies, and expect the user not to do anything /too/
-# stupid. (For example, installing Apache with only FastCGI support, and
-# PHP with only CGI support.)
-#
-# Another annoyance is that the upstream Makefile uses app-arch/unzip to
-# extract a snapshot of AngularJS, but that's only needed when USE=web.
-#
-MOD_ALIAS=apache2_modules_alias
-DEPEND="sys-devel/libtool
-	virtual/mailx
-	perl? ( dev-lang/perl:= )
-	web? (
-		app-arch/unzip
-		media-libs/gd[jpeg,png]
-		lighttpd? ( www-servers/lighttpd[php] )
-		apache2? (
-			|| (
-				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgi]
-				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgid]
-				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_fcgid] )
-			|| (
-				dev-lang/php:*[apache2]
-				dev-lang/php:*[cgi]
-				dev-lang/php:*[fpm] )
-		)
-	)"
-RDEPEND="${DEPEND}
-	vim-syntax? ( app-vim/nagios-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /var/nagios/home nagios
-}
-
-src_configure() {
-	local myconf
-
-	if use perl; then
-		myconf="${myconf} --enable-embedded-perl --with-perlcache"
-	fi
-
-	if use !apache2 && use !lighttpd ; then
-		myconf="${myconf} --with-command-group=nagios"
-	else
-		if use apache2 ; then
-			myconf="${myconf} --with-command-group=apache"
-			myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d"
-		elif use lighttpd ; then
-			myconf="${myconf} --with-command-group=lighttpd"
-		fi
-	fi
-
-	econf ${myconf} \
-		--prefix=/usr \
-		--bindir=/usr/sbin \
-		--sbindir=/usr/$(get_libdir)/nagios/cgi-bin \
-		--datadir=/usr/share/nagios/htdocs \
-		--localstatedir=/var/nagios \
-		--sysconfdir=/etc/nagios \
-		--libexecdir=/usr/$(get_libdir)/nagios/plugins
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) nagios
-
-	if use web; then
-		# Only compile the CGIs/HTML when USE=web is set.
-		emake CC=$(tc-getCC) DESTDIR="${D}" cgis html
-	fi
-}
-
-src_install() {
-	dodoc Changelog CONTRIBUTING.md README.asciidoc THANKS UPGRADING
-
-	emake DESTDIR="${D}" install-base
-	emake DESTDIR="${D}" install-basic
-	emake DESTDIR="${D}" install-config
-	emake DESTDIR="${D}" install-commandmode
-
-	if use web; then
-		emake DESTDIR="${D}" install-cgis
-
-		# install-html installs the new exfoliation theme
-		emake DESTDIR="${D}" install-html
-
-		if use classicui; then
-			# This overwrites the already-installed exfoliation theme
-			emake DESTDIR="${D}" install-classicui
-		fi
-
-		# Install cute Gentoo icons (bug #388323), setting their
-		# owner, group, and mode to match those of the rest of Nagios's
-		# images.
-		insopts --group=nagios --owner=nagios --mode=0664
-		insinto /usr/share/nagios/htdocs/images/logos
-		doins "${WORKDIR}/${GENTOO_ICONS}"/*.*
-		insopts --mode=0644 # Back to the default...
-	fi
-
-	newinitd openrc-init nagios
-
-	if use web ; then
-		if use apache2 ; then
-			# Install the Nagios configuration file for Apache.
-			insinto "/etc/apache2/modules.d"
-			doins "${FILESDIR}"/99_nagios4.conf
-		elif use lighttpd ; then
-			# Install the Nagios configuration file for Lighttpd.
-			insinto /etc/lighttpd
-			newins "${FILESDIR}/lighttpd_nagios4.conf" nagios.conf
-		else
-			ewarn "${CATEGORY}/${PF} only supports apache or lighttpd"
-			ewarn "out of the box. Since you are not using one of them, you"
-			ewarn "will have to configure your webserver yourself."
-		fi
-	fi
-
-	for dir in etc/nagios var/nagios ; do
-		chown -R nagios:nagios "${D}/${dir}" \
-			|| die "failed chown of ${D}/${dir}"
-	done
-
-	chown -R root:root "${D}/usr/$(get_libdir)/nagios" \
-		|| die "failed chown of ${D}/usr/$(get_libdir)/nagios"
-
-	# The following two find...exec statements will die properly as long
-	# as chmod is only called once (that is, as long as the argument
-	# list is small enough).
-	find "${D}/usr/$(get_libdir)/nagios" -type d \
-		-exec chmod 755 '{}' + || die 'failed to make nagios dirs traversable'
-
-	if use web; then
-		find "${D}/usr/$(get_libdir)/nagios/cgi-bin" -type f \
-			-exec chmod 755 '{}' + || die 'failed to make cgi-bins executable'
-	fi
-
-	keepdir /etc/nagios
-	keepdir /var/nagios
-	keepdir /var/nagios/archives
-	keepdir /var/nagios/rw
-	keepdir /var/nagios/spool/checkresults
-
-	if use !apache2 && use !lighttpd; then
-		chown -R nagios:nagios "${D}"/var/nagios/rw \
-			|| die "failed chown of ${D}/var/nagios/rw"
-	else
-		if use apache2 ; then
-			chown -R nagios:apache "${D}"/var/nagios/rw \
-				|| die "failed chown of ${D}/var/nagios/rw"
-		elif use lighttpd ; then
-			chown -R nagios:lighttpd "${D}"/var/nagios/rw \
-				|| die "failed chown of ${D}/var/nagios/rw"
-		fi
-	fi
-
-	chmod ug+s "${D}"/var/nagios/rw || die "failed chmod of ${D}/var/nagios/rw"
-	chmod 0750 "${D}"/etc/nagios || die "failed chmod of ${D}/etc/nagios"
-}
-
-pkg_postinst() {
-
-	if use web; then
-		elog "Note that your web server user requires read-only access to"
-		elog "${ROOT}etc/nagios."
-
-		if use apache2 || use lighttpd ; then
-			elog
-			elog "To that end, we have changed the group of ${ROOT}etc/nagios"
-			elog "to that of your web server user."
-			elog
-			if use apache2; then
-				chown nagios:apache "${ROOT}etc/nagios" \
-					|| die "failed to change group of ${ROOT}etc/nagios"
-
-				elog "To enable the Nagios web front-end, please edit"
-				elog "${ROOT}etc/conf.d/apache2 and add \"-D NAGIOS -D PHP\""
-				elog "to APACHE2_OPTS. Then Nagios will be available at,"
-				elog
-			elif use lighttpd; then
-				chown nagios:lighttpd "${ROOT}etc/nagios" \
-					|| die "failed to change group of ${ROOT}etc/nagios"
-				elog "To enable the Nagios web front-end, please add"
-				elog "'include \"nagios.conf\"' to the lighttpd configuration"
-				elog "file at ${ROOT}etc/lighttpd/lighttpd.conf. Then Nagios"
-				elog "will be available at,"
-				elog
-			fi
-
-			elog "  http://localhost/nagios/"
-		else
-			elog "Since you're not using either Apache or Lighttpd, you"
-			elog "will have to grant the necessary permissions yourself."
-		fi
-	fi
-
-	elog
-	elog "If your kernel has /proc protection, nagios"
-	elog "will not be happy as it relies on accessing the proc"
-	elog "filesystem. You can fix this by adding nagios into"
-	elog "the group wheel, but this is not recomended."
-	elog
-}
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.0.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.0.ebuild
deleted file mode 100644
index 4f2dbf117c3f..000000000000
--- a/net-analyzer/nagios-core/nagios-core-4.4.0.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs user
-
-MY_P=${PN/-core}-${PV}
-DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
-HOMEPAGE="https://www.nagios.org/"
-
-# The name of the directory into which our Gentoo icons will be
-# extracted, and also the basename of the archive containing it.
-GENTOO_ICONS="${PN}-gentoo-icons-20141125"
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
-	web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="apache2 classicui lighttpd perl +web vim-syntax"
-
-# In pkg_postinst(), we change the group of the Nagios configuration
-# directory to that of the web server user. It can't belong to both
-# apache/lighttpd groups at the same time, so we block this combination
-# for our own sanity.
-#
-# This could be made to work, but we would need a better way to allow
-# the web user read-only access to Nagios's configuration directory.
-#
-REQUIRED_USE="apache2? ( !lighttpd )"
-
-# sys-devel/libtool dependency is bug #401237.
-#
-# Note, we require one of the apache2 CGI modules:
-#
-#   * mod_cgi
-#   * mod_cgid
-#   * mod_fcgid
-#
-# We just don't care /which/ one. And of course PHP supports both CGI
-# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
-# dependencies, and expect the user not to do anything /too/
-# stupid. (For example, installing Apache with only FastCGI support, and
-# PHP with only CGI support.)
-#
-# Another annoyance is that the upstream Makefile uses app-arch/unzip to
-# extract a snapshot of AngularJS, but that's only needed when USE=web.
-#
-MOD_ALIAS=apache2_modules_alias
-DEPEND="sys-devel/libtool
-	virtual/mailx
-	perl? ( dev-lang/perl:= )
-	web? (
-		app-arch/unzip
-		media-libs/gd[jpeg,png]
-		lighttpd? ( www-servers/lighttpd[php] )
-		apache2? (
-			|| (
-				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgi]
-				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgid]
-				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_fcgid] )
-			|| (
-				dev-lang/php:*[apache2]
-				dev-lang/php:*[cgi]
-				dev-lang/php:*[fpm] )
-		)
-	)"
-RDEPEND="${DEPEND}
-	vim-syntax? ( app-vim/nagios-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /var/nagios/home nagios
-}
-
-src_configure() {
-	local myconf
-
-	if use perl; then
-		myconf="${myconf} --enable-embedded-perl --with-perlcache"
-	fi
-
-	if use !apache2 && use !lighttpd ; then
-		myconf="${myconf} --with-command-group=nagios"
-	else
-		if use apache2 ; then
-			myconf="${myconf} --with-command-group=apache"
-			myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d"
-		elif use lighttpd ; then
-			myconf="${myconf} --with-command-group=lighttpd"
-		fi
-	fi
-
-	econf ${myconf} \
-		--prefix=/usr \
-		--bindir=/usr/sbin \
-		--sbindir=/usr/$(get_libdir)/nagios/cgi-bin \
-		--datadir=/usr/share/nagios/htdocs \
-		--localstatedir=/var/nagios \
-		--sysconfdir=/etc/nagios \
-		--libexecdir=/usr/$(get_libdir)/nagios/plugins
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) nagios
-
-	if use web; then
-		# Only compile the CGIs/HTML when USE=web is set.
-		emake CC=$(tc-getCC) DESTDIR="${D}" cgis html
-	fi
-}
-
-src_install() {
-	dodoc Changelog CONTRIBUTING.md README.md THANKS UPGRADING
-
-	# There is no way to install the CGIs unstripped from the top-level
-	# makefile, so descend into base/ here. The empty INSTALL_OPTS
-	# ensures that root:root: owns the nagios executables.
-	cd "${S}/base" || die
-	emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
-	cd "${S}" || die
-
-	# Otherwise this gets installed as 770 and you get "access denied"
-	# for some reason or other when starting nagios. The permissions
-	# on nagiostats are just for consistency (these should both get
-	# fixed upstream).
-	fperms 775 /usr/sbin/nagios /usr/sbin/nagiostats
-
-	# INSTALL_OPTS are needed for most of install-basic, but we don't
-	# want them on the LIBEXECDIR, argh.
-	emake DESTDIR="${D}" install-basic
-	fowners root:root /usr/$(get_libdir)/nagios/plugins
-
-	# Don't make the configuration owned by the nagios user, because
-	# then he can edit nagios.cfg and trick nagios into running as root
-	# and doing his bidding.
-	emake INSTALL_OPTS="" DESTDIR="${D}" install-config
-
-	# No INSTALL_OPTS used in install-commandmode, thankfully.
-	emake DESTDIR="${D}" install-commandmode
-
-	if use web; then
-		# There is no way to install the CGIs unstripped from the
-		# top-level makefile, so descend into cgi/ here. The empty
-		# INSTALL_OPTS ensures that root:root: owns the CGI executables.
-		cd "${S}/cgi" || die
-		emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
-		cd "${S}" || die
-
-		# install-html installs the new exfoliation theme
-		emake INSTALL_OPTS="" DESTDIR="${D}" install-html
-
-		if use classicui; then
-			# This overwrites the already-installed exfoliation theme
-			emake INSTALL_OPTS="" DESTDIR="${D}" install-classicui
-		fi
-
-		# Install cute Gentoo icons (bug #388323), setting their
-		# owner, group, and mode to match those of the rest of Nagios's
-		# images.
-		insinto /usr/share/nagios/htdocs/images/logos
-		doins "${WORKDIR}/${GENTOO_ICONS}"/*.*
-	fi
-
-	newinitd startup/openrc-init nagios
-
-	if use web ; then
-		if use apache2 ; then
-			# Install the Nagios configuration file for Apache.
-			insinto "/etc/apache2/modules.d"
-			doins "${FILESDIR}"/99_nagios4.conf
-		elif use lighttpd ; then
-			# Install the Nagios configuration file for Lighttpd.
-			insinto /etc/lighttpd
-			newins "${FILESDIR}/lighttpd_nagios4.conf" nagios.conf
-		else
-			ewarn "${CATEGORY}/${PF} only supports apache or lighttpd"
-			ewarn "out of the box. Since you are not using one of them, you"
-			ewarn "will have to configure your webserver yourself."
-		fi
-	fi
-}
-
-pkg_postinst() {
-
-	if use web; then
-		if use apache2 || use lighttpd ; then
-			if use apache2; then
-				elog "To enable the Nagios web front-end, please edit"
-				elog "${ROOT}etc/conf.d/apache2 and add \"-D NAGIOS -D PHP\""
-				elog "to APACHE2_OPTS. Then Nagios will be available at,"
-				elog
-			elif use lighttpd; then
-				elog "To enable the Nagios web front-end, please add"
-				elog "'include \"nagios.conf\"' to the lighttpd configuration"
-				elog "file at ${ROOT}etc/lighttpd/lighttpd.conf. Then Nagios"
-				elog "will be available at,"
-				elog
-			fi
-
-			elog "  http://localhost/nagios/"
-		fi
-	fi
-
-	elog
-	elog "If your kernel has /proc protection, nagios"
-	elog "will not be happy as it relies on accessing the proc"
-	elog "filesystem. You can fix this by adding nagios into"
-	elog "the group wheel, but this is not recomended."
-	elog
-}
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.1.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.1.ebuild
deleted file mode 100644
index b29021b26ea8..000000000000
--- a/net-analyzer/nagios-core/nagios-core-4.4.1.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs user
-
-MY_P=${PN/-core}-${PV}
-DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
-HOMEPAGE="https://www.nagios.org/"
-
-# The name of the directory into which our Gentoo icons will be
-# extracted, and also the basename of the archive containing it.
-GENTOO_ICONS="${PN}-gentoo-icons-20141125"
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
-	web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="apache2 classicui lighttpd perl +web vim-syntax"
-
-# In pkg_postinst(), we change the group of the Nagios configuration
-# directory to that of the web server user. It can't belong to both
-# apache/lighttpd groups at the same time, so we block this combination
-# for our own sanity.
-#
-# This could be made to work, but we would need a better way to allow
-# the web user read-only access to Nagios's configuration directory.
-#
-REQUIRED_USE="apache2? ( !lighttpd )"
-
-# sys-devel/libtool dependency is bug #401237.
-#
-# Note, we require one of the apache2 CGI modules:
-#
-#   * mod_cgi
-#   * mod_cgid
-#   * mod_fcgid
-#
-# We just don't care /which/ one. And of course PHP supports both CGI
-# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
-# dependencies, and expect the user not to do anything /too/
-# stupid. (For example, installing Apache with only FastCGI support, and
-# PHP with only CGI support.)
-#
-# Another annoyance is that the upstream Makefile uses app-arch/unzip to
-# extract a snapshot of AngularJS, but that's only needed when USE=web.
-#
-MOD_ALIAS=apache2_modules_alias
-DEPEND="sys-devel/libtool
-	virtual/mailx
-	perl? ( dev-lang/perl:= )
-	web? (
-		app-arch/unzip
-		media-libs/gd[jpeg,png]
-		lighttpd? ( www-servers/lighttpd[php] )
-		apache2? (
-			|| (
-				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgi]
-				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgid]
-				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_fcgid] )
-			|| (
-				dev-lang/php:*[apache2]
-				dev-lang/php:*[cgi]
-				dev-lang/php:*[fpm] )
-		)
-	)"
-RDEPEND="${DEPEND}
-	vim-syntax? ( app-vim/nagios-syntax )"
-
-PATCHES=(
-	"${FILESDIR}/nagios-4.4.2-pre.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /var/nagios/home nagios
-}
-
-src_configure() {
-	local myconf
-
-	if use perl; then
-		myconf="${myconf} --enable-embedded-perl --with-perlcache"
-	fi
-
-	if use !apache2 && use !lighttpd ; then
-		myconf="${myconf} --with-command-group=nagios"
-	else
-		if use apache2 ; then
-			myconf="${myconf} --with-command-group=apache"
-			myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d"
-		elif use lighttpd ; then
-			myconf="${myconf} --with-command-group=lighttpd"
-		fi
-	fi
-
-	econf ${myconf} \
-		--prefix=/usr \
-		--bindir=/usr/sbin \
-		--sbindir=/usr/$(get_libdir)/nagios/cgi-bin \
-		--datadir=/usr/share/nagios/htdocs \
-		--localstatedir=/var/nagios \
-		--sysconfdir=/etc/nagios \
-		--libexecdir=/usr/$(get_libdir)/nagios/plugins
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) nagios
-
-	if use web; then
-		# Only compile the CGIs/HTML when USE=web is set.
-		emake CC=$(tc-getCC) DESTDIR="${D}" cgis html
-	fi
-}
-
-src_install() {
-	dodoc Changelog CONTRIBUTING.md README.md THANKS UPGRADING
-
-	# There is no way to install the CGIs unstripped from the top-level
-	# makefile, so descend into base/ here. The empty INSTALL_OPTS
-	# ensures that root:root: owns the nagios executables.
-	cd "${S}/base" || die
-	emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
-	cd "${S}" || die
-
-	# Otherwise this gets installed as 770 and you get "access denied"
-	# for some reason or other when starting nagios. The permissions
-	# on nagiostats are just for consistency (these should both get
-	# fixed upstream).
-	fperms 775 /usr/sbin/nagios /usr/sbin/nagiostats
-
-	# INSTALL_OPTS are needed for most of install-basic, but we don't
-	# want them on the LIBEXECDIR, argh.
-	emake DESTDIR="${D}" install-basic
-	fowners root:root /usr/$(get_libdir)/nagios/plugins
-
-	# Don't make the configuration owned by the nagios user, because
-	# then he can edit nagios.cfg and trick nagios into running as root
-	# and doing his bidding.
-	emake INSTALL_OPTS="" DESTDIR="${D}" install-config
-
-	# No INSTALL_OPTS used in install-commandmode, thankfully.
-	emake DESTDIR="${D}" install-commandmode
-
-	if use web; then
-		# There is no way to install the CGIs unstripped from the
-		# top-level makefile, so descend into cgi/ here. The empty
-		# INSTALL_OPTS ensures that root:root: owns the CGI executables.
-		cd "${S}/cgi" || die
-		emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
-		cd "${S}" || die
-
-		# install-html installs the new exfoliation theme
-		emake INSTALL_OPTS="" DESTDIR="${D}" install-html
-
-		if use classicui; then
-			# This overwrites the already-installed exfoliation theme
-			emake INSTALL_OPTS="" DESTDIR="${D}" install-classicui
-		fi
-
-		# Install cute Gentoo icons (bug #388323), setting their
-		# owner, group, and mode to match those of the rest of Nagios's
-		# images.
-		insinto /usr/share/nagios/htdocs/images/logos
-		doins "${WORKDIR}/${GENTOO_ICONS}"/*.*
-	fi
-
-	newinitd startup/openrc-init nagios
-
-	if use web ; then
-		if use apache2 ; then
-			# Install the Nagios configuration file for Apache.
-			insinto "/etc/apache2/modules.d"
-			doins "${FILESDIR}"/99_nagios4.conf
-		elif use lighttpd ; then
-			# Install the Nagios configuration file for Lighttpd.
-			insinto /etc/lighttpd
-			newins "${FILESDIR}/lighttpd_nagios4.conf" nagios.conf
-		else
-			ewarn "${CATEGORY}/${PF} only supports apache or lighttpd"
-			ewarn "out of the box. Since you are not using one of them, you"
-			ewarn "will have to configure your webserver yourself."
-		fi
-	fi
-}
-
-pkg_postinst() {
-
-	if use web; then
-		if use apache2 || use lighttpd ; then
-			if use apache2; then
-				elog "To enable the Nagios web front-end, please edit"
-				elog "${ROOT}etc/conf.d/apache2 and add \"-D NAGIOS -D PHP\""
-				elog "to APACHE2_OPTS. Then Nagios will be available at,"
-				elog
-			elif use lighttpd; then
-				elog "To enable the Nagios web front-end, please add"
-				elog "'include \"nagios.conf\"' to the lighttpd configuration"
-				elog "file at ${ROOT}etc/lighttpd/lighttpd.conf. Then Nagios"
-				elog "will be available at,"
-				elog
-			fi
-
-			elog "  http://localhost/nagios/"
-		fi
-	fi
-
-	elog
-	elog "If your kernel has /proc protection, nagios"
-	elog "will not be happy as it relies on accessing the proc"
-	elog "filesystem. You can fix this by adding nagios into"
-	elog "the group wheel, but this is not recomended."
-	elog
-}
diff --git a/net-analyzer/nagios/Manifest b/net-analyzer/nagios/Manifest
index 685528aa09fa..627d99120a11 100644
--- a/net-analyzer/nagios/Manifest
+++ b/net-analyzer/nagios/Manifest
@@ -1,6 +1,3 @@
-EBUILD nagios-4.3.3.ebuild 393 BLAKE2B 9698b8a0efcd6930c84611cb9aee6a792dc1555922f93ddd62f546a966cec83e4d03e7b7a4bd18ceb10de91e58fb4dae04f0514be0ca94247059848c95616383 SHA512 d5cb30f16a97bbd59154223e4dbf62bf98d6c2e03d5021bc8f3ed9c11c8a1bc25b0391d1809a5cbb8b2345ce7c5ae88afb3f3c8473c09bee0bec46da5a52639a
-EBUILD nagios-4.3.4.ebuild 400 BLAKE2B fbd1d3c6d07c27bae1f9ebe45385f5c02797e85c557b1ea2276de7a211cb0afe4edb7589e6b492d466daa66906cf14ce4cb73fccdd3915ce99a4f861a1d24e01 SHA512 e766f3e115adb6e8c1ad8e490b107d8dfc1d8125e7290ce854332198f49d9d2cf0ee7adc5c9091250b8ca2357dc1f48e875fe31e7f0b811b4e631e79cc1efb93
-EBUILD nagios-4.4.0.ebuild 400 BLAKE2B fbd1d3c6d07c27bae1f9ebe45385f5c02797e85c557b1ea2276de7a211cb0afe4edb7589e6b492d466daa66906cf14ce4cb73fccdd3915ce99a4f861a1d24e01 SHA512 e766f3e115adb6e8c1ad8e490b107d8dfc1d8125e7290ce854332198f49d9d2cf0ee7adc5c9091250b8ca2357dc1f48e875fe31e7f0b811b4e631e79cc1efb93
-EBUILD nagios-4.4.1.ebuild 400 BLAKE2B fbd1d3c6d07c27bae1f9ebe45385f5c02797e85c557b1ea2276de7a211cb0afe4edb7589e6b492d466daa66906cf14ce4cb73fccdd3915ce99a4f861a1d24e01 SHA512 e766f3e115adb6e8c1ad8e490b107d8dfc1d8125e7290ce854332198f49d9d2cf0ee7adc5c9091250b8ca2357dc1f48e875fe31e7f0b811b4e631e79cc1efb93
+EBUILD nagios-4.3.4.ebuild 391 BLAKE2B 31a1586c68f74b862b0ee308ae8818c574a1e33f94a2b3daaa6d3a7d52622a61bcda61a5c968dcd911ad55ac03797dd0b54f85d4d98ebc79630fb0ed655c671e SHA512 80f20980638b39862e3026ff34e1a4827161366ad1c8079a32b8bd2736a67a3d4da2d042e9da54b6c0eef6dd2b3d196c7cdcb2949ac796d614e92fa9817cd85b
 EBUILD nagios-4.4.2.ebuild 400 BLAKE2B fbd1d3c6d07c27bae1f9ebe45385f5c02797e85c557b1ea2276de7a211cb0afe4edb7589e6b492d466daa66906cf14ce4cb73fccdd3915ce99a4f861a1d24e01 SHA512 e766f3e115adb6e8c1ad8e490b107d8dfc1d8125e7290ce854332198f49d9d2cf0ee7adc5c9091250b8ca2357dc1f48e875fe31e7f0b811b4e631e79cc1efb93
 MISC metadata.xml 1110 BLAKE2B a3577be74f7ae7da47c1add86da6b9cd2972ebea1e4e4241886027e7c4aecb936ffa776a32bcc0b77498c393ebb4c81aa9a98a3c8d45cbd5556f8b9014384e52 SHA512 7614b25879899b4939a136de6cd4cbd3995372747e95d2d6b90ccd8e074800b6acb738df5f9c852625c34f5a72c3072c0dec910266068ec8a72184f75aa204e1
diff --git a/net-analyzer/nagios/nagios-4.3.3.ebuild b/net-analyzer/nagios/nagios-4.3.3.ebuild
deleted file mode 100644
index 2c40afdab198..000000000000
--- a/net-analyzer/nagios/nagios-4.3.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="The Nagios metapackage"
-HOMEPAGE="https://www.nagios.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="~net-analyzer/nagios-core-${PV}
-	|| ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )"
diff --git a/net-analyzer/nagios/nagios-4.3.4.ebuild b/net-analyzer/nagios/nagios-4.3.4.ebuild
index a29da55bee71..820a19606479 100644
--- a/net-analyzer/nagios/nagios-4.3.4.ebuild
+++ b/net-analyzer/nagios/nagios-4.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.nagios.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="~net-analyzer/nagios-core-${PV}
diff --git a/net-analyzer/nagios/nagios-4.4.0.ebuild b/net-analyzer/nagios/nagios-4.4.0.ebuild
deleted file mode 100644
index a29da55bee71..000000000000
--- a/net-analyzer/nagios/nagios-4.4.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="The Nagios metapackage"
-HOMEPAGE="https://www.nagios.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="~net-analyzer/nagios-core-${PV}
-	|| ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )"
diff --git a/net-analyzer/nagios/nagios-4.4.1.ebuild b/net-analyzer/nagios/nagios-4.4.1.ebuild
deleted file mode 100644
index a29da55bee71..000000000000
--- a/net-analyzer/nagios/nagios-4.4.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="The Nagios metapackage"
-HOMEPAGE="https://www.nagios.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="~net-analyzer/nagios-core-${PV}
-	|| ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )"
diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest
index 184b4a29c849..dd0112a1781f 100644
--- a/net-analyzer/nagstamon/Manifest
+++ b/net-analyzer/nagstamon/Manifest
@@ -2,6 +2,8 @@ AUX nagstamon-2.0-setup.patch 1095 BLAKE2B 6dfc2516266a1cc70b527573fd941a7cc41d9
 AUX nagstamon-3.0-setup.patch 1139 BLAKE2B f399c6c600785629c7c90b1de396c17805882554f3d4d9e0932cbf0c8761496cccac57b068b7a7c161bcde11223db2ed4a0c5563a15267f13d3553147044ca0f SHA512 7ec4f621e1dc91cb941811aaacb6322fee8024d39dfa65e39b3a19631a3ef7c78d4fcd4d8df5630b76904e3c415290b35ac777c4d0e863ce83e15832d061ea4d
 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.tar.gz 545142 BLAKE2B 22346395a23fbc875e5262cf4a9c23d1350c060ddba1a2a554d86bfa4b7b2500e5f7d6163f015c7dc6ab71669f613287235e19246de0ba3c6c22c362158710e8 SHA512 6a49dd1a86d8388cb3092b1971eebde5783d7cca46c36e93adcd5afecf041163d75c70ef5f7e59d725e8744b86785f0f2fee5e14475023a19362babe142659c8
 EBUILD nagstamon-2.0.1.ebuild 1193 BLAKE2B 9364c8ec44986d3352e29ba9a543cb417f812c114746e5743bf5993463d34adff33c75967c8bb3fae6783cda1a5653601afcdcf03d4c6d86c3eb1d4f79fb6f68 SHA512 4e4e469d11fcb40dfc5a3a2f0ce5c95886432c92f11116f9e860fb7f3ae7a0159ea26108bf32729ef75807bc37e885e96cb97b22e9b806057eeac0e27ae298e1
 EBUILD nagstamon-3.0.2-r1.ebuild 1383 BLAKE2B 19c84d6faa5a09290a73da7252060e5a23fa52f0c040e8fad80154269595f291933c8150e6b714cd4882e3164696e0f35aed75144f6b5cec8fe3e37e101f1596 SHA512 42ed49a6983b713c208e7cf59214fbd25056cfb014d73ead0039d1a127238d59718218e2ff9731ea6a9eedbe959a234360d703f162d947fb3c424c80de4f3e36
+EBUILD nagstamon-3.2.ebuild 1509 BLAKE2B d3fe8a51cf09f29f6636b973873747d520e2323bf1d4c737aed6a2178ee3e10f1b043d18a22ed9d678872f51870c4511411e6794bc4cb2560b40216d71870f0f SHA512 034530306d182fdb7a6bdbe2d1c628a759a02476789cf0062fee0d933f413f7cdf49a3ca5eb377f0baff10fc22be04c6ac99f953d1fcb2e88724c31dcae30c93
 MISC metadata.xml 525 BLAKE2B ad9c68b36b1260f907ceb8f50389fd0e035d441d33e99c71bb8dd493cda5cdaaa4e2ec32746d2b96d15b776d9de03070e411515f34e90c93063dd4b6b803c155 SHA512 5a1bf5be48ee8d28b501dceea33c65791b13cf0301c6bb170e4fe5ecd7b771cc28d3e9a49b82440770800854146961069cb26529ed5fe3e2c9a796329b085c64
diff --git a/net-analyzer/nagstamon/nagstamon-3.2.ebuild b/net-analyzer/nagstamon/nagstamon-3.2.ebuild
new file mode 100644
index 000000000000..d734e9dc56f8
--- /dev/null
+++ b/net-analyzer/nagstamon/nagstamon-3.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit eutils python-r1 distutils-r1
+
+MY_PN="Nagstamon"
+MY_P="${MY_PN}-${PV/_p/-}"
+
+DESCRIPTION="status monitor for the desktop"
+DESCRIPTION="systray monitor for displaying realtime status of several monitoring systems"
+HOMEPAGE="https://nagstamon.ifw-dresden.de"
+SRC_URI="https://nagstamon.ifw-dresden.de/files/stable/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/PyQt5[gui,multimedia,svg,widgets,${PYTHON_USEDEP}]
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/keyring[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/secretstorage[${PYTHON_USEDEP}]
+	>=dev-python/python-xlib-0.19[${PYTHON_USEDEP}]
+	dev-python/requests-kerberos[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_PN}"
+
+PATCHES="${FILESDIR}/${PN}-3.0-setup.patch"
+
+src_prepare() {
+	default_src_prepare
+
+	# pre-compressed already
+	rm Nagstamon/resources/nagstamon.1.gz || die
+	sed -i -e 's:\(nagstamon\.1\)\.gz:\1:' setup.py || die
+
+	mv ${PN}.py ${PN} || die
+
+	rm -rf "${S}/Nagstamon/thirdparty/Xlib/" || die
+}
diff --git a/net-analyzer/nagvis/Manifest b/net-analyzer/nagvis/Manifest
deleted file mode 100644
index de96a5dec116..000000000000
--- a/net-analyzer/nagvis/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX nagvis-1.6.6-base-path.patch 799 BLAKE2B a9e226ea8103952ca17eb4956b73e5fb3a9903da6fbbee127fc92f3e13157b063d280caba12cc73b0800458d25a3f8c27eceb98ede8f1a17480f57956543ee68 SHA512 54476998b1bf0b8ce25691fff558e3faa0aefaa4c1ba5d9804e809ae862f79cb96ea87fb7368a1100282bbc8d1f89902f8b4bca397df1ea24a840996889de1e0
-AUX nagvis-1.6.6-global-definitions.patch 1177 BLAKE2B cae158eaed43f312a5abdec47b49535843661e6136dbfe85b257ae4e139352d9cf653dd89143b8c372c1aad1a0fff57881180174d0cd0e1855eedcc4f4ea12d2 SHA512 26d53a48852082010c660280ffef786a8713a02ba675b4b455de48c65136816772c8012ead282bd8da879b1696bf811e4ef091765cc3014d5b2fb1445166c79d
-DIST nagvis-1.6.6.tar.gz 3430714 BLAKE2B af932327b91f64b1d146d6937f45f94ff9826728126c19254abc4ba57883fce18380e36f99a205532df93b4a1b9225ad34140a90d3d80e2203581353c0915ea1 SHA512 e5858b185dd5d31fc8d414df5b3464941769249ce582b10e155e89ba7aa0c45724550c44de9d7bfb23b96caa737e519f320e45050126feb94593cca2bfc583cb
-EBUILD nagvis-1.6.6.ebuild 2768 BLAKE2B 36e0e64c1b9a0132fcf97ab051bd41af366ffd377a486dd6f836f9b6851040c5a565260abf47dc69b95b66115ff81b86a9ef54d102347650b68126272c320458 SHA512 25566b1c0bcf9a097614001652588b174c88312aa12fec7b47be1171be5e08a095387fab6da7f250cfc31791be3e124ded3aa9d84a3330b2073608138e7ce24f
-MISC metadata.xml 365 BLAKE2B dfc8368f1c2baf8905ed90fa4371d2bcc13adddd9c61efb0721adcd9587af43f84432e834b543e390f90f48f88b803cb7e88a91b96c516c658be770e6efbdc59 SHA512 3c0b10ae339027a59540557329d0a0316d6f82c791a6f915d06e6b19f7c12e26145e08845b9eb901d5fb2ca460953c6625978a701b552bc559f30a7eca0e18fd
diff --git a/net-analyzer/nagvis/files/nagvis-1.6.6-base-path.patch b/net-analyzer/nagvis/files/nagvis-1.6.6-base-path.patch
deleted file mode 100644
index 771076c4eaa7..000000000000
--- a/net-analyzer/nagvis/files/nagvis-1.6.6-base-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/share/server/core/classes/GlobalMainCfg.php	2012-05-31 11:14:23.000000000 -0400
-+++ b/share/server/core/classes/GlobalMainCfg.php	2012-05-31 11:17:10.000000000 -0400
-@@ -1215,8 +1215,8 @@
-      * @author	Roman Kyrylych <rkyrylych@op5.com>
-      */
-     private function getBasePath() {
--        // Go 3 levels up from nagvis/share/nagvis to nagvis base path
--        return realpath(dirname($_SERVER['SCRIPT_FILENAME']) . '/../../..') . '/';
-+        // Go 2 levels up from share/nagvis to nagvis base path
-+        return realpath(dirname($_SERVER['SCRIPT_FILENAME']) . '/../..') . '/';
-         // Note: the method below causes problems when <docroot>/nagvis is a symlink to <nagvis-base>/share
-         // return realpath(dirname(dirname(dirname($_SERVER['SCRIPT_FILENAME'])))).'/';
-     }
diff --git a/net-analyzer/nagvis/files/nagvis-1.6.6-global-definitions.patch b/net-analyzer/nagvis/files/nagvis-1.6.6-global-definitions.patch
deleted file mode 100644
index 9786b970179f..000000000000
--- a/net-analyzer/nagvis/files/nagvis-1.6.6-global-definitions.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/share/server/core/defines/global.php	2012-05-13 05:44:27.000000000 -0400
-+++ b/share/server/core/defines/global.php	2012-05-31 11:20:39.000000000 -0400
-@@ -64,7 +64,7 @@
- define('DEBUGLEVEL', 6);
- 
- // Path to the debug file
--define('DEBUGFILE', '../../../var/nagvis-debug.log');
-+define('DEBUGFILE', '../../var/nagvis-debug.log');
- 
- // It is possible to define a conf.d directory for splitting the main
- // configuration in several files. Only the values defined in the CONST_MAINCFG
-@@ -78,14 +78,14 @@
- // The last value wins.
- //
- // Path to the main configuration file
--define('CONST_MAINCFG', '../../../etc/nagvis.ini.php');
--define('CONST_MAINCFG_CACHE', '../../../var/nagvis-conf');
-+define('CONST_MAINCFG', '../../etc/nagvis.ini.php');
-+define('CONST_MAINCFG_CACHE', '../../var/nagvis-conf');
- 
- // Path to the main configuration conf.d directory
--define('CONST_MAINCFG_DIR', '../../../etc/conf.d');
-+define('CONST_MAINCFG_DIR', '../../etc/conf.d');
- 
- // The directory below the NagVis root which is shared by the webserver
--define('HTDOCS_DIR', 'share');
-+define('HTDOCS_DIR', '');
- 
- // Needed minimal PHP version
- define('CONST_NEEDED_PHP_VERSION', '5.0');
diff --git a/net-analyzer/nagvis/metadata.xml b/net-analyzer/nagvis/metadata.xml
deleted file mode 100644
index 03cfbae2f915..000000000000
--- a/net-analyzer/nagvis/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-needed -->
-  <use>
-    <flag name="automap">Enable automated map generation using <pkg>media-gfx/graphviz</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">nagvis</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-analyzer/nagvis/nagvis-1.6.6.ebuild b/net-analyzer/nagvis/nagvis-1.6.6.ebuild
deleted file mode 100644
index 19ce16533ff7..000000000000
--- a/net-analyzer/nagvis/nagvis-1.6.6.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils depend.apache
-
-DESCRIPTION="Visualization addon for the network managment system Nagios"
-HOMEPAGE="http://www.nagvis.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="apache2 automap"
-
-DEPEND="virtual/httpd-php"
-RDEPEND="|| ( net-analyzer/nagios net-analyzer/icinga )
-	automap? ( >=media-gfx/graphviz-2.14 )
-	apache2? ( dev-lang/php[apache2] )
-	net-analyzer/mk-livestatus
-	dev-lang/php[gd,nls,json,session,pdo,sqlite,sockets,mysql,unicode,xml]
-	virtual/httpd-php:*"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-base-path.patch
-	epatch "${FILESDIR}"/${P}-global-definitions.patch
-	grep -Rl "/usr/local" "${S}"/* | xargs sed -i s:/usr/local:/usr:g ||die
-	sed -i s:@NAGVIS_WEB@:/nagvis:g "${S}"/etc/apache2-nagvis.conf-sample ||die
-	sed -i s:@NAGVIS_PATH@:/usr/share/nagvis/:g "${S}"/etc/apache2-nagvis.conf-sample ||die
-	sed -i s:/usr/nagios/var/rw/live:/var/nagios/rw/live:g "${S}"/etc/nagvis.ini.php-sample ||die
-}
-
-src_install() {
-	dodoc README INSTALL
-
-	insinto /usr/share/nagvis
-	doins -r share/{config.php,index.php,frontend,netmap,server,userfiles}
-	doins -r docs
-
-	diropts -o apache -g root
-	dodir /var/nagvis/tmpl/{cache,compile}
-	diropts
-	dosym /var/nagvis /usr/share/nagvis/var
-
-	if use apache2 ; then
-		insinto "${APACHE_MODULES_CONFDIR}"
-		newins etc/apache2-nagvis.conf-sample 98_${PN}.conf
-	fi
-
-	insinto /etc/nagvis
-	doins -r etc/{conf.d,automaps,geomap,.htaccess,nagvis.ini.php-sample}
-	fowners apache:root /etc/nagvis
-	fperms 0664 /etc/nagvis/nagvis.ini.php-sample
-	dosym /etc/nagvis /usr/share/nagvis/etc
-
-	diropts -o apache -g root -m0775
-	insopts -o apache -g root -m0664
-	doins -r etc/maps
-	diropts
-	insopts
-
-	# move image maps dir from usr to var and symlink it back
-	dodir /var/nagvis/userfiles/images
-	mv "${D}"/usr/share/nagvis/userfiles/images/maps "${D}"/var/nagvis/userfiles/images/ ||die
-	fowners apache:root /var/nagvis/userfiles/images/maps
-	dosym /var/nagvis/userfiles/images/maps /usr/share/nagvis/userfiles/images/maps
-}
-
-pkg_postinst() {
-	elog "Before running NagVis for the first time, you will need to set up"
-	elog "/etc/nagvis/nagvis.ini.php"
-	elog "A sample is in"
-	elog "/etc/nagvis/nagvis.ini.php-sample"
-	if use apache2 ; then
-		elog
-		elog "For web interface make sure to add -D NAGVIS to APACHE2_OPTS in"
-		elog "/etc/conf.d/apache2 and to restart apache2. A default configuration"
-		elog "has been placed at /etc/apache2/modules.d/98_${PN}.conf"
-	fi
-	elog ""
-	elog "Default user/password are: nagiosadmin/nagiosadmin"
-	elog "                                 guest/guest"
-}
diff --git a/net-analyzer/nessus-agent-bin/Manifest b/net-analyzer/nessus-agent-bin/Manifest
index d825887a7c65..21b73b83547b 100644
--- a/net-analyzer/nessus-agent-bin/Manifest
+++ b/net-analyzer/nessus-agent-bin/Manifest
@@ -1,8 +1,6 @@
 AUX nessusagent.initd 563 BLAKE2B 63820368c95dc2358ff73843e239a084e21cea48bd4dfd170e486f0c702e7ec6be1581478f7c37dd12868dd3648dfd8f44b8ff47c85fdab0276a0c84b78eb7d1 SHA512 acc9a64e1cbff1119876f186aa6c40d6f5772c55a919914c410fed9e0974d2ce8fe5b965248aeae590ae5dd551ab530c59dad42c6f793d995193f9b8f9d89718
-DIST NessusAgent-6.11.2-es7.x86_64.rpm 15539504 BLAKE2B 1e03c2716200d88d600d2085adcbad6038a9b1aff1d4c80c291ba2609102fa34af43fabdceece545de9496f515252fcefd3ff6c8e13511635c7a6aa25bb146a3 SHA512 4ce8c8bf1ca8137712a796ddf5a39f139287789a6b966241b0f5831ee69bccdff5519c8fb821a043d00c5014f456a0f941e0d2de278383a49ddd73a0f6c18a2a
-DIST NessusAgent-7.0.0-es7.x86_64.rpm 15595940 BLAKE2B a5796aca8efd3a0fa5191437bd055cae817a7a498cf6149d757f28acf268814652295f92b4cf5351b71175e1b498b59fe18e77a2cfaa7e253a53aa889b6677cd SHA512 10cce476f8ba822b0e5fc1dc7f47f3a531b0ac48553e769f18b14641bc1e323be3940e6712e7a2c4286f8b874cbf7dd02f85fd283da109a30864be875bedbfd9
 DIST NessusAgent-7.1.1-es7.x86_64.rpm 15646432 BLAKE2B 5c78ab227f309fd0b86b504ca18cb767b768785111517faebee44c56d226a2189d34ceacaae000907b89e977192bc8a058236499b865a593fb5754f46f6521ee SHA512 5f1340f26ae11378ddc1efc4d2f153111e592955ec648f740ffa538d5e437332f5c79ab92a737ebbb318786ef28ab5177c8cc73ebde909529c050b64df2ee8a1
-EBUILD nessus-agent-bin-6.11.2.ebuild 1953 BLAKE2B 245026dc56e78152af282fce40624191a681db4db51f86dff68bdf6dbcfecb3288d8984ffadc40d4dc56096c1e91acc5a8a324b93aa7d7b3f2173e59741f3c58 SHA512 e88f677a4a2b371712ca487bc67a377708b5c9dd8c8d2aed9c6f77fac056c3a6118d204348beee8241faa7d305fbfcc79014eaaae2cda06ff5ac824a316d5d7c
-EBUILD nessus-agent-bin-7.0.0.ebuild 1953 BLAKE2B 245026dc56e78152af282fce40624191a681db4db51f86dff68bdf6dbcfecb3288d8984ffadc40d4dc56096c1e91acc5a8a324b93aa7d7b3f2173e59741f3c58 SHA512 e88f677a4a2b371712ca487bc67a377708b5c9dd8c8d2aed9c6f77fac056c3a6118d204348beee8241faa7d305fbfcc79014eaaae2cda06ff5ac824a316d5d7c
+DIST NessusAgent-7.1.2-es7.x86_64.rpm 15663484 BLAKE2B 6b7290a39984acfc95ec0b75c8f9e6b04ecdfe630fe792f32ffb539676bad73a7db02789dcbfb6dae3d40c1e9eef1065282c20ca9a3c51b29fe0540f70cc82bc SHA512 64aff80fd5115b0f261e0156c83a67b47a7f68d7d1e8803be87a54cecaf6be1f03bf213ee68a0ffae9a2b2ad35ea7766445444ed132c077f46127cd5772f7a39
 EBUILD nessus-agent-bin-7.1.1.ebuild 1953 BLAKE2B 9bd08652ac2e2ef1497e287a04b6705020ce2872fd688c1251ac39897d821d6b2ffb9a390e41f12edaf19e2c3f9f986ecba8512f1e78bfb99196a3755ac18c4e SHA512 d94c80cea575a349cf7a27f8d9783bdbde29f6e33052c1b6b83fc4a58b5984e65053c9ab3193118e42039bccec7ae256825a9853af0dde6261cc077ef706b2d9
+EBUILD nessus-agent-bin-7.1.2.ebuild 1958 BLAKE2B 8f62b408a8fbe4ab8839336cd7ac93e7be1544dc32a0dbd419cca1ddd97894218b88e413afd9d4fc624dd896181ce889a856f9079cb2df58e503e0f8416219a7 SHA512 94e71f56bc55f560c3b372fcf20a3aa73ccfc8441aecbfb3e54aa25701c34542d40171f2bddc93815abb5414500dc17921705a570cb00c9a646ed39714e1abe6
 MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.0.0.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.0.0.ebuild
deleted file mode 100644
index f7e50ca245a6..000000000000
--- a/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.0.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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}/agent-download"
-	einfo "The archive should then be placed into ${DISTDIR}."
-}
-
-src_install() {
-	# Using doins -r would strip executable bits from all binaries
-	cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files"
-
-	pax-mark m "${D}"/opt/nessus_agent/sbin/nessusd
-
-	# Make sure these originally empty directories do not vanish,
-	# Nessus will not run properly without them
-	keepdir /opt/nessus_agent/com/nessus/CA
-	keepdir /opt/nessus_agent/etc/nessus
-	keepdir /opt/nessus_agent/var/nessus/logs
-	keepdir /opt/nessus_agent/var/nessus/tmp
-	keepdir /opt/nessus_agent/var/nessus/users
-
-	newinitd "${FILESDIR}"/nessusagent.initd nessusagent
-	systemd_dounit usr/lib/systemd/system/nessusagent.service
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "In order to link the agent to Tenable.io or an instance of Nessus Manager,"
-		elog "obtain an appropriate linking key and run"
-		elog ""
-		elog "  /opt/nessus_agent/sbin/nessuscli agent link --key=<key> --host=<host> --port=<port> [optional parameters]"
-		elog ""
-		elog "This can be done before the agent is started."
-	fi
-}
diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-6.11.2.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.1.2.ebuild
index f7e50ca245a6..fe50f423bbb1 100644
--- a/net-analyzer/nessus-agent-bin/nessus-agent-bin-6.11.2.ebuild
+++ b/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.1.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit rpm pax-utils systemd
 
@@ -30,7 +30,7 @@ QA_PREBUILT="opt/nessus_agent/bin/nasl
 S="${WORKDIR}"
 
 pkg_nofetch() {
-	einfo "Please download ${A} from ${HOMEPAGE}/agent-download"
+	einfo "Please download ${A} from ${HOMEPAGE}/download/nessus-agents"
 	einfo "The archive should then be placed into ${DISTDIR}."
 }
 
diff --git a/net-analyzer/nessus-bin/Manifest b/net-analyzer/nessus-bin/Manifest
index e892e78b9314..f1ff15900e62 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-6.10.5-es7.x86_64.rpm 41596796 BLAKE2B 2d9078eb3a53bc9fe63a649f6829ac757424bdecd007bdcaefcda661951a18918ce4f2823fe3ae88ded68453e82a06ccd2d225db26713c5b72bdd09f9e665b1d SHA512 a407aa010d3d59d5c4d717159851a6b81ef9e1f1b4327c8382abe1b866c4969cf6e32251077270eae719b66af9ce29641c40ca6093df30f88ce9be81ba168f75
+DIST Nessus-8.0.1-es7.x86_64.rpm 62028348 BLAKE2B 07e174d8d3c68773e55cacf57ca836163288db0c4458a8e987279ef9099a82c662aaf00699e5938afe51d549a1114144a0fef246151d4b2c088367bc900236aa SHA512 4351c40e0133f1ca56d0366814b9daba1ee4e12aa496fcc23971f26e9313fdab9c195b43c0848488acdea178a95d383bdf46ecf0355a2214713ce23458156ab9
 EBUILD nessus-bin-6.10.5.ebuild 1760 BLAKE2B 534ef9b00baee3679189c4d6c6a04ace2d21f5902013c34ff2ff045d3514226ea03ba559174af911107b3909343c2d91910052f089be847a4675c77f2f150437 SHA512 4389e324582a3d9177cfa1f717ded52c561385e75e05c1ce20dec63a802a871d88996d9d50bc7e0683a614c0ad1f2e38d88eea771f7d5eb40ca523bbf1310661
-MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
+EBUILD nessus-bin-8.0.1.ebuild 1647 BLAKE2B 3545597809f491f20dc0384a802509e1499883926d4b8e74794d8f30f78b29d96796184ceccdae973b48e6a6846d3c50731e61bdcd15bfd4b2727e9b72f154fd SHA512 88d7ebfc0a1a83ce71766657f9ff06d001bd33ed7ee97cf7458ed95bd007fac7f10754bad4cffedaeb77f1826c62a348ae8a30171b817f79409486387aa0ef06
+MISC metadata.xml 378 BLAKE2B e50657a9e2f4d45e9e98dff42285ee235260f4336766b4fb009d5f1621e5b37ef342cfd2079dc569f07b302dbd8a888973e54e3e2093ccff5342ab2797c01e70 SHA512 c406caf29d68764b9b0be058c7002869dd4ada724d83a83e06701eb6ff87cff397a417b498eaf5c1b0a27c4945de66f2c80860a85f6395b05b96cb844dadc4de
diff --git a/net-analyzer/nessus-bin/metadata.xml b/net-analyzer/nessus-bin/metadata.xml
index 74c2baebb4ec..961085586781 100644
--- a/net-analyzer/nessus-bin/metadata.xml
+++ b/net-analyzer/nessus-bin/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<maintainer type="person">
+	<email>marecki@gentoo.org</email>
+	<name>Marek Szuba</name>
+</maintainer>
 <maintainer type="project">
 	<email>netmon@gentoo.org</email>
 	<name>Gentoo network monitoring and analysis project</name>
diff --git a/net-analyzer/nessus-bin/nessus-bin-8.0.1.ebuild b/net-analyzer/nessus-bin/nessus-bin-8.0.1.ebuild
new file mode 100644
index 000000000000..ed738ccba2e2
--- /dev/null
+++ b/net-analyzer/nessus-bin/nessus-bin-8.0.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 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.${PV}
+	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 ${DISTDIR}."
+}
+
+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 0e10b2a30383..01432e04b3f9 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,6 +1,8 @@
 DIST netdata-1.10.0.tar.gz 2611773 BLAKE2B ffc4bfa593e4a36785c7e09709f1063598bd337016ad858e435049c5821f44fd5f048e4e7874e06d67c7e59234f6ec67a8a50fc7573f6b2f0cd768770ee2a612 SHA512 2358db818ad7d1ef6298c25d3f9d6c5a5a850f5bbe033b82cca1f3bc154055523637691417b6f2c2d4b7273b575afa0ec13e203ea7c2dd6321088a078ef05017
 DIST netdata-1.11.0.tar.gz 2845399 BLAKE2B e80faa3eb584ec4d617d223463a65f680e199125329c0c5db25c5320421b2c0e769f9334a49824e3974398055238e3bb27f741668850fa6191ffd810da08dc89 SHA512 c3b4045276e4a5af63ccc5403f34d37f2de6dcd95a653aa15ad33dba26c46f2d4cba06b17b1d5289bd1b8697777a41a79a159296f6843a910841523c418149ff
+DIST netdata-1.11.1.tar.gz 3050309 BLAKE2B 9fc5498362f30ff34744c3d5ecd882abbd234240b718524aae2a61224f2facdf448017cb6e6db57acd2b008021ddf020ce47efb97409f6b9580d9d2cfbdff531 SHA512 92c0b848ada9edbb3d0c2d432a2f9cfb8b47c496827fc80496c18de8b53698bb5fe8bdcb1909d0931cb9cb2b313ca1e4dec7538f03a4bc0da634cb4d495abf88
 EBUILD netdata-1.10.0-r1.ebuild 2541 BLAKE2B 70123767be2cbdf1d90dcb05a44a7c34cee223ce00a2b9aa803d5e8c242a638f05be593c4ad382ecc93fb5cc7db443984ae1777adf032da40ca336b4ae4d07ca SHA512 531ceafb0dc2b8988a5af2c1c3c42298bb009d5ae022619cee1940c67fa7b117f5b5fb495ac02adfad61e93729db5908e1b869c114130835d5027fe519faddba
 EBUILD netdata-1.11.0.ebuild 2572 BLAKE2B ce0ff1be7d3290ab66561060bbe9a78e67a93f63d926f46a83c53e9d29ad899268e4b99190effda3976b37c79815936416a788c8ae3cdbb7728eb4916ea4a731 SHA512 57aecf1d2a8e2139dbb002838c6320ea3c2da0935a588a237ab1190dfbfa8761d393c117a519d23885044e8448dbb5e0fe767892c25b2a3e2c7e6c9cb8e97bf4
+EBUILD netdata-1.11.1.ebuild 2637 BLAKE2B 350cefa34f5963df9969c8ee78fb7bdcfa807827c37f6cc716dbdda1e55d59c2d1dcb4614ed10552afa363932cb4ec786891dd971f8cb596173dd9f675856b22 SHA512 ee2fe5a9c9cddfcb2cc74fad245e6778cfcedeaf16088b2c3c78377fbd2d6124930436443aa35efcc8e2881669939a9bfdd20b701cc6bb4066b1a030d4b62470
 EBUILD netdata-9999.ebuild 2637 BLAKE2B 350cefa34f5963df9969c8ee78fb7bdcfa807827c37f6cc716dbdda1e55d59c2d1dcb4614ed10552afa363932cb4ec786891dd971f8cb596173dd9f675856b22 SHA512 ee2fe5a9c9cddfcb2cc74fad245e6778cfcedeaf16088b2c3c78377fbd2d6124930436443aa35efcc8e2881669939a9bfdd20b701cc6bb4066b1a030d4b62470
 MISC metadata.xml 864 BLAKE2B 2c56df62c37c672fe6343a740efa82d16c44dc6f3f38a9afb51cb9c6e93aabd6344ddad599c1504d670e9c1447374b3c6f74125da83577721bcf88a4f68a2dc2 SHA512 cf053acf66105fdd9dfdcff3f6d130f11a2ea0bbf4c553ae704fd86fdd7787efddd55b1bb5f7f8d2ba7e6e2e1a8b800bd80bf907c9b0beba8f12c15e1277694b
diff --git a/net-analyzer/netdata/netdata-1.11.1.ebuild b/net-analyzer/netdata/netdata-1.11.1.ebuild
new file mode 100644
index 000000000000..9e53cefcc74a
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.11.1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+
+inherit autotools fcaps linux-info python-r1 systemd user
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="caps +compression cpu_flags_x86_sse2 ipmi mysql nfacct nodejs postgres +python tor"
+REQUIRED_USE="
+	mysql? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tor? ( python )"
+
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+	>=app-shells/bash-4:0
+	|| (
+		net-analyzer/openbsd-netcat
+		net-analyzer/netcat6
+		net-analyzer/netcat
+	)
+	net-analyzer/tcpdump
+	net-analyzer/traceroute
+	net-misc/curl
+	net-misc/wget
+	sys-apps/util-linux
+	virtual/awk
+	caps? ( sys-libs/libcap )
+	compression? ( sys-libs/zlib )
+	ipmi? ( sys-libs/freeipmi )
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl
+	)
+	nodejs? ( net-libs/nodejs )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		mysql? (
+			|| (
+				dev-python/mysqlclient[${PYTHON_USEDEP}]
+				dev-python/mysql-python[${PYTHON_USEDEP}]
+			)
+		)
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+		tor? ( net-libs/stem[${PYTHON_USEDEP}] )
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+: ${NETDATA_USER:=netdata}
+: ${NETDATA_GROUP:=netdata}
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 / ${PN}
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-user=${NETDATA_USER} \
+		$(use_enable nfacct plugin-nfacct) \
+		$(use_enable ipmi plugin-freeipmi) \
+		$(use_enable cpu_flags_x86_sse2 x86-sse) \
+		$(use_with compression zlib)
+}
+
+src_install() {
+	default
+
+	rm -rf "${D}/var/cache" || die
+
+	# Remove unneeded .keep files
+	find "${ED}" -name ".keep" -delete || die
+
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
+	keepdir /var/log/netdata
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
+	keepdir /var/lib/netdata
+	keepdir /var/lib/netdata/registry
+
+	fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
+
+	newinitd system/netdata-openrc ${PN}
+	systemd_dounit system/netdata.service
+	insinto /etc/netdata
+	doins system/netdata.conf
+}
diff --git a/net-analyzer/netsniff-ng/Manifest b/net-analyzer/netsniff-ng/Manifest
index 04162ee18ff5..49326111c644 100644
--- a/net-analyzer/netsniff-ng/Manifest
+++ b/net-analyzer/netsniff-ng/Manifest
@@ -3,4 +3,4 @@ DIST netsniff-ng-0.6.1.tar.xz 565956 BLAKE2B ed965ee91c3d4bb6f339f983ee67052633f
 EBUILD netsniff-ng-0.6.0.ebuild 1320 BLAKE2B 68cee00362c24a31186394df316e552d44c0786782fb8ba045d73b1f82b8cdb6fc0fbfb706bef130dc48d2bd4abf1f243b9d4bb084812f13860cac148a2f84aa SHA512 5dde5693a54ccf3a4aeb39dda5ff03eb3e966388e1e157c910c8bfabb9a7f0f75cb1e934361962ea8ece8101a39fe58ed9a5418069977c307c4caf85ab575f12
 EBUILD netsniff-ng-0.6.1.ebuild 1324 BLAKE2B 43e5ab2c4dd9b2b6b2241b11c423330c03d2055649fa6c363ffe53b91dc56bbfabc54b8bc394442cac48150fe97ebcc94a7f5821bef1eba371f654fd69e297e6 SHA512 6d297cfc26ea6f5f6a1cbb577cb9c593a68022cd4448112e40f93a56ab250820fed3071245459c9d5b1fa60372feb0bfe8e473ea33a9eb8285c190c67b2036ae
 EBUILD netsniff-ng-9999.ebuild 1321 BLAKE2B 6972fb2c40d19b2d4257ec0641ca6777e8ee236b0da9cf159da18279b6b9b3aa204148d4e4c75046bdec64c51089ebfba06d2b2f0e615ae9331c912c55c97284 SHA512 39e58aaa796dc1056a54b8f00bf6ffca0a2bc21b66d0b1c75d6b84251a44250d5e6858d84b5fd3c8dcabce5baf55896744c2a8f269328659aa68d650a3ff1fb5
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-analyzer/netsniff-ng/metadata.xml b/net-analyzer/netsniff-ng/metadata.xml
index a535b8852829..6f49eba8f496 100644
--- a/net-analyzer/netsniff-ng/metadata.xml
+++ b/net-analyzer/netsniff-ng/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-analyzer/nsca/Manifest b/net-analyzer/nsca/Manifest
index e26b1f5aa684..fac4b353b406 100644
--- a/net-analyzer/nsca/Manifest
+++ b/net-analyzer/nsca/Manifest
@@ -1,5 +1,5 @@
 AUX nsca.conf 219 BLAKE2B 0ce329240a846e3fc011b82322e2635aa396bfd5eecadf5834becb08b1085e32d30be337b174d777208a882dd2fdcc71939d3fed100534e0c6b431a4e11f9b5a SHA512 c7dda1f94611e028b52ae6bf330db1415b18a88590a8a7c54d1f862aaa326751b39e88380cd24217aab11f32ef5842c6b1d4a0333ca0310a5be0e94c573165b2
 AUX nsca.init 645 BLAKE2B baa298df97c4c29fa563a1dde1ef6cf962acf2ec50797b68f073f744fd56eadf97b6163196c497e83d49b4daf8c2eac04378d8b4d00ffae32796e0f8e926ab3d SHA512 88fab799a388dc6f10a2eac94b1ee5d1a76687c408958cc8cf5c22219d10b439d0c9c64a9ae9f34211e19eccb95cb2417e4b972c5549d23ef4bdd5493cdaf224
 DIST nsca-2.7.2.tar.gz 104953 BLAKE2B 74dce7b59149cd41fe316dc48588d744131efbbe8073d0defe3542a774ac7dd7429a23e5e7f6b2c9b9e45fa1938cdb2994bfcf93e745c12c8fb5bfbbeb627e6e SHA512 f84cac3613bbd0ded4ec700c1dadac71ed075544d0f48281a70946a67792b7f4bcdf6dc3bd5ccf1293cc6a0277638e0f034c33064bf9c05696b4f015e7f15010
-EBUILD nsca-2.7.2-r103.ebuild 2123 BLAKE2B b50bddffd24cbd98a85723bb4fe186c1cae6e0e79d60807b1787cdb2c2c2d97e6ae9febd69ed31ae517fafe91edcb673dd1365afda13c1d9f46b4217ebce55f2 SHA512 b1588edc660fa3909911d39a591631ab099863a823869facfa6bca35456a9faafee98718919686d0c62fc06cf62b87ce25a3e9a7fc9aceafbd1a425479bb8f6e
+EBUILD nsca-2.7.2-r103.ebuild 2125 BLAKE2B 74ce2b3b0a356d1cda5a1095be7592847c9368feed4e08adbdd9abac2cbd09fcfeea993232be01228145b617dee015d5a7b732997f7094ffe1bcddd26cac7cd5 SHA512 336f8f99d4fedb82b6e692f061917bcb87ba5c74b618b209ceb14a3cbe7e46a2294bac63302caaddd200d3e429f296542122e359db38c1f9b2ce808d130d9917
 MISC metadata.xml 1732 BLAKE2B 9a1c8c74f4a0b8fb4d79340d3f1860ecb0b885b5709f54ea63eb7a8b288b99ce31875d54829c87b5865b62fa75126f2713f64febc2e812981113c7172fe3aa70 SHA512 1e24a8adef9fb860b05eed48d741e7b2b981ca826300f14ee3c2b7ddd6a497fbc3318a31a9f284eb11a7f216d71ad567d4a4438e03876c83985bd8683b525a1b
diff --git a/net-analyzer/nsca/nsca-2.7.2-r103.ebuild b/net-analyzer/nsca/nsca-2.7.2-r103.ebuild
index 1f25434494ee..d342f7a3adc6 100644
--- a/net-analyzer/nsca/nsca-2.7.2-r103.ebuild
+++ b/net-analyzer/nsca/nsca-2.7.2-r103.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/nagios/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc x86"
 IUSE="tcpd +crypt minimal"
 
 DEPEND="crypt? ( >=dev-libs/libmcrypt-2.5.1-r4 )
diff --git a/net-analyzer/openbsd-netcat/Manifest b/net-analyzer/openbsd-netcat/Manifest
index 224b7c069bab..a7fd68e7c6a3 100644
--- a/net-analyzer/openbsd-netcat/Manifest
+++ b/net-analyzer/openbsd-netcat/Manifest
@@ -1,5 +1,5 @@
 AUX openbsd-netcat-1.105-darwin.patch 1591 BLAKE2B 9df26c2efec9d234fa3bc8d1d20438b8bb5a1dce85e0d1c2636ffa7b79467af1b228f2a347bdc7795865784c3ce9d98b5e9801887bc1a4a7fbe9da0ce649463b SHA512 12a36f277b5a88491bcd8b3cb1c564bf9e3251c2a2b0f113ee425aa554bbb29b5cd2a87cdf0f67ad6b9cf3bc9a56d8a175d73ce4cb86fb4c531fd146b85b0ee9
-AUX openbsd-netcat-1.190-darwin.patch 1715 BLAKE2B 5dacad5dbec8e2b8ce3ed454aaf856105b8acf01167afd7f1215040b36e339acf96c2d128955c885edbc73c1cb0544e79272187b7fdb9f6d2e4f04da0f7ff176 SHA512 689c032d4aaafda55020356663faeb00f2888a0a9f76e47831c2089c4231090f65444f6ed27408518948acaf3f2bb0508d26b54bc432a6ab5203118693a6b2b8
+AUX openbsd-netcat-1.190-darwin.patch 3090 BLAKE2B d4e02d4f7acfccba697ae31ae61c7e843fbb3d2521f012e698a78e6cfe5f1c21020f64d69c83e6f4eb4ab43b8d4ffcf55118509f407b36d3d6e3a75fd75fc29c SHA512 7989c5161d7416878fb9335f18bab9d5ab4a972ef4f4ce971935a14eed4019170e79c393818ed89828fb5783ded617750e0a160ca78130cd85f654cc9e34940b
 DIST netcat-openbsd_1.105-7.debian.tar.gz 31843 BLAKE2B 115eb2d0c0f35055eb26608746806ba97d15b9320954b5d531a73f3f76ed22238395797e90bc3e60dd9cf5b31e696eec59843f37001093013ed0ef82ae590126 SHA512 ec507c858a9f0e75f5a8d6ee8e60eef5200428e55091e831a7acba6c61d70f97af01103c9b65354b0ce773214b0758d957852af793debb70be8aab5b5900b3f6
 DIST netcat-openbsd_1.105.orig.tar.gz 14891 BLAKE2B 65119a4e2cb3d9cd7b2d7d346b827ff1c175cc3255f40d70bbd45213b438635d6b063b3cf210d27595e38b0d67339788221ae5c3737e6096782245fb573bca3a SHA512 1e515b5af83a12c6f270d6e8bede6406cc7c9f83ca0e316816508dfe2e2c49cda3fffb6b24a3922bf9908dc8b70d540eb8cc49e9cbfe867e49133c004d3f4703
 DIST netcat-openbsd_1.190-2.debian.tar.xz 34836 BLAKE2B 3ff4390c07d05e8d1a19c8696da12bdc6bba07c6e88281b04cd7915509f44a14dda66462128da768b255d92f3a02d008750a860db9290f9f8e0e0bb9dd66e01b SHA512 c33510ad6761627e0b7e564747f6ae82c7569157bdc91f6a282a97b038b2b0917c27fdfba137462c7c34d84fcfdfe8b6393204884d153e3d200a86f5c6657a9a
diff --git a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin.patch b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin.patch
index 818b13a81a59..e1a462e746b7 100644
--- a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin.patch
+++ b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin.patch
@@ -75,6 +75,53 @@ index a0fb51b..bbb5dd1 100644
  int
  main(int argc, char *argv[])
  {
+@@ -814,9 +814,8 @@
+ # endif
+ 			} else {
+ 				len = sizeof(cliaddr);
+-				connfd = accept4(s, (struct sockaddr *)&cliaddr,
+-				    &len, SOCK_NONBLOCK);
+-				if (connfd == -1) {
++				connfd = accept(s, (struct sockaddr *)&cliaddr, &len);
++				if (connfd == -1 || fcntl(connfd, F_SETFL, O_NONBLOCK) == -1) {
+ 					/* For now, all errnos are fatal */
+ 					err(1, "accept");
+ 				}
+@@ -1092,14 +1091,16 @@
+ 	int s, save_errno;
+ 
+ 	if (uflag) {
+-		if ((s = unix_bind(unix_dg_tmp_socket, SOCK_CLOEXEC)) < 0)
++		if ((s = unix_bind(unix_dg_tmp_socket, 0)) < 0)
+ 			return -1;
+ 	} else {
+-		if ((s = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0)) < 0) {
++		if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
+ 			errx(1,"create unix socket failed");
+ 			return -1;
+ 		}
+ 	}
++	if (fcntl(s, F_SETFD, FD_CLOEXEC) == -1)
++		return -1;
+ 
+ 	memset(&s_un, 0, sizeof(struct sockaddr_un));
+ 	s_un.sun_family = AF_UNIX;
+@@ -1174,9 +1175,13 @@
+ 		    port, gai_strerror(error));
+ 
+ 	for (res = res0; res; res = res->ai_next) {
+-		if ((s = socket(res->ai_family, res->ai_socktype |
+-		    SOCK_NONBLOCK, res->ai_protocol)) < 0)
++		if ((s = socket(res->ai_family, res->ai_socktype,
++		    res->ai_protocol)) < 0)
++			continue;
++		if (fcntl(s, F_SETFL, O_NONBLOCK) == -1) {
++			close(s);
+ 			continue;
++		}
+ 
+ 		/* Bind to a local port or source address if specified. */
+ 		if (sflag || pflag) {
 diff --git a/socks.c b/socks.c
 index 9068f39..68b68e3 100644
 --- a/socks.c
diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index b2d4fb081f78..08ef46d7cb3b 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -1,9 +1,9 @@
 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.0.tar.gz 1351888 BLAKE2B d80d996bd247a90074b79bab69d709f70df74c7d89a552d01d86e718b165bc0091c560f4c5164db0c770b952d7bfe6660ac8c3a057f5ae8f321c015b9bdc40d3 SHA512 14f1cecc562f008d9b79259f885fc3a1d0a74efa4840d6150277c9bb3c67a233ca9a6b921d9d83fd488d1eb6f535075d7fbf53de0036c48611ffcbf5eb7559b5
 DIST pmacct-1.7.1.tar.gz 1392360 BLAKE2B 75a4dda461c2fe643c24a901c19efacf325d1922bcda503a1ff41fe0b6c4178732d476b479875e9e0ba34872dbd86b8d8b2087471148f10e202f57c4a212f2fd SHA512 6a5d75522b9197b324907598ee4ba22bbda96b45e10f62df2ae507e23faac927af5468f587deab08d1e0f3f6422c609d106dcf30fa7bf16eb215bb35ea6aa08c
+DIST pmacct-1.7.2.tar.gz 1416302 BLAKE2B 5d6f9c5849c07c7bdd3b6251b2611935ff558ca393d2cc0d21e5e681b0069b3a5bb4a985a9dc59b62b8b4ed697ecbd4cbb71f0aba42ce8d1527187b98d2e90d3 SHA512 ffdc63e96fc6af6f5d531243bc0aec0925663d8e91e83ada275f8e9a969dcf85cebd06b17ae2c796722bb209602d5b2bc487757ec736a740a8f33698d93a8675
 EBUILD pmacct-1.6.2.ebuild 1790 BLAKE2B be2fe64588677200a54a4866e2946cb5516fb65d4f1ac0bef07287796321d3832c4acba1284f8bc285bbacf6513493a297880bccca350e6d7286ef6569e1d6e6 SHA512 6db9673c145cec1da55e4cd18428f64fb334066eb0a5794adc6127a0ba27144301237aa6e30e1c4a93ce892ad4306369da46e9572b41430df7a776080b7edcc0
-EBUILD pmacct-1.7.0.ebuild 1943 BLAKE2B 64e813482f238b84c06b6f2f41d56cf0c3f04a82dd2d97c606135eda2f6ef33f8b2d2d43b8fe01dd740024d009b90c87f2045f36b78e68018116b67b529a4b0f SHA512 5c6b819d64f4fb9fe08a5b8e32651f69e83f996e98189e547d57136c8e0f8183db2e62a147e2669cc88c8d6581bf973b3261085214885d2cedef116c3e9ade80
 EBUILD pmacct-1.7.1.ebuild 2120 BLAKE2B 3c93a931372991ca9f82a3793b48b28d3a4a899d9fcc680028ca5ca164373ebabbabc9430c9ccf5dc69d5ec1bd4af86583e6b10984e7cacbd4323c2e4faf5900 SHA512 cbf0c8e7a7b26e8b8a6c6ca8fa1a8f6f7742100c3cf738f064e1313342013cb51f5f9454385fe3f0b8c093465a73808c714294edb48a1d3de95ce59aa41610e9
+EBUILD pmacct-1.7.2.ebuild 2111 BLAKE2B 598253321d0a34d836b076042af6a9d9e9718264ea951924997cedc47ce57defb25bbee6c115af55109401454f5b437105e8c09f35e9a6386ab8f4c5118401b3 SHA512 c6d375731194b7dde9850d77b058ded0bc1623b4ee59475c1ebde39fe525726d94a4f1c1490b37570e15351aec42468c19a9f1561c9bf01a72bbad51365f8770
 MISC metadata.xml 1424 BLAKE2B 75ce1e74993587289adbef0841807d758f0a587bc5b0429cb03a86be690d49479a2cf37211006ae905473528f3f4714ec2827e5bc556a4bcaf368215f97db7b8 SHA512 ddfd0eaac09d66640660baffe80ca83911000632416602eb258b2c01e630ada343ebeff7191c53fe71e4d5e658c94eac9a95bf4527a9ba40ee674ffa9442d856
diff --git a/net-analyzer/pmacct/pmacct-1.7.0.ebuild b/net-analyzer/pmacct/pmacct-1.7.2.ebuild
index 762deb0d3058..816cc388c10c 100644
--- a/net-analyzer/pmacct/pmacct-1.7.0.ebuild
+++ b/net-analyzer/pmacct/pmacct-1.7.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="A network tool to gather IP traffic information"
@@ -12,8 +12,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="
-	64bit geoip geoipv2 ipv6 jansson kafka mongodb mysql ndpi nflog postgres
-	rabbitmq sqlite threads zmq
+	64bit +bgp-bins +bmp-bins geoip geoipv2 ipv6 jansson kafka +l2 mongodb
+	mysql ndpi nflog plabel postgres rabbitmq sqlite +st-bins +traffic-bins zmq
 "
 REQUIRED_USE="
 	?? ( geoip geoipv2 )
@@ -45,7 +45,7 @@ DEPEND="
 "
 
 DOCS=(
-	CONFIG-KEYS ChangeLog FAQS QUICKSTART TOOLS UPGRADE
+	CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE
 	docs/INTERNALS docs/PLUGINS docs/SIGNALS
 )
 
@@ -55,11 +55,15 @@ src_configure() {
 
 	econf \
 		$(use_enable 64bit) \
+		$(use_enable bgp-bins) \
+		$(use_enable bmp-bins) \
 		$(use_enable geoip) \
 		$(use_enable geoipv2) \
 		$(use_enable ipv6) \
 		$(use_enable jansson) \
 		$(use_enable kafka) \
+		$(use_enable l2) \
+		$(use_enable plabel) \
 		$(use_enable mongodb) \
 		$(use_enable mysql) \
 		$(use_enable ndpi) \
@@ -67,7 +71,8 @@ src_configure() {
 		$(use_enable postgres pgsql) \
 		$(use_enable rabbitmq) \
 		$(use_enable sqlite sqlite3) \
-		$(use_enable threads) \
+		$(use_enable st-bins) \
+		$(use_enable traffic-bins) \
 		$(use_enable zmq) \
 		--disable-debug
 }
diff --git a/net-analyzer/scli/Manifest b/net-analyzer/scli/Manifest
index 2b11cf93d576..89239429f154 100644
--- a/net-analyzer/scli/Manifest
+++ b/net-analyzer/scli/Manifest
@@ -1,4 +1,4 @@
 AUX scli-0.4.0-configure.patch 1545 BLAKE2B 4e95bf9b1723228a2c946170314246a713c4ddb9dde3d6e103f54633ab2172c9e5618d319527c336027c990d5c1f4e4abb799a3a609898d10689abe5858549b1 SHA512 423daf0251bc65f84c430638f235ff30cd75257c221394332f4fd51b8c5deabb02fc97751b77e4571305107fe2ac66062c27cdf74a2d3d46f2f278d7983cf622
 DIST scli-0.4.0.tar.gz 953401 BLAKE2B b6f3ccd1dbc69df882e3dbd73f8a686af76e370a5785cb475b9122a200cc9a01ae364d50fd391499cd88856ebb1e1a1869c8545b36eaecf73b45d46d47282b9b SHA512 ceb81e51049def64cb6f2428263709802380f7f712575e327a71d8cc120d284a7d9c57679d76e22cfcaf5b160d0d46af0cefa1133c56972b43002cb94f120dcc
-EBUILD scli-0.4.0-r1.ebuild 701 BLAKE2B 64cc01305225cefa47712556ae48d8c35a56d708d8b647dc89742b67b76a4cb049dd3315e494bf8cd1829e6efe601784c9b7f327945be70b7235ef73ba32132d SHA512 c2b00fe9c8f15f3fdb0a2f0dc877937f16fbc8fe8b4c44e0dcee5f74b6412eaceb5f1ef18363565d9cf5c36fffac51c8b1c7a2842ed1f366892c46873eb005a1
+EBUILD scli-0.4.0-r1.ebuild 649 BLAKE2B 9e96bc6ac72516d6cfd69a2645ad62cf809dc0c8cb978d19f1eac566a5e2ce3fd60b1e692361a4a1ca69de273f9c1b031617f284a09b837cf5a3bc37e0bd803c SHA512 822ccfe3fcfb13851ef7a5db609ecc95e5dc11da194861f3dd4c549f651dcd8eab8014fcb3a180d9ec63830a34a37615071013c7fd21e9be347a7a8dfd049b26
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/net-analyzer/scli/scli-0.4.0-r1.ebuild b/net-analyzer/scli/scli-0.4.0-r1.ebuild
index 54aae413bbfe..200f73836851 100644
--- a/net-analyzer/scli/scli-0.4.0-r1.ebuild
+++ b/net-analyzer/scli/scli-0.4.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit autotools eutils
 
 DESCRIPTION="SNMP Command Line Interface"
-HOMEPAGE="http://cnds.eecs.jacobs-university.de/users/schoenw/articles/software/index.html"
+HOMEPAGE="https://github.com/schoenw/scli"
 SRC_URI="ftp://ftp.ibr.cs.tu-bs.de/pub/local/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/smokeping/Manifest b/net-analyzer/smokeping/Manifest
index a610a992f37a..dac3ff456f5f 100644
--- a/net-analyzer/smokeping/Manifest
+++ b/net-analyzer/smokeping/Manifest
@@ -5,9 +5,9 @@ AUX smokeping.init.3 1737 BLAKE2B 0c1ad0e4c5dd843097eadbdd2e2309f9f89c5f336ae209
 AUX smokeping.init.5 1360 BLAKE2B 4213a42dcd43c1166c5f10d287c9e50be37265f8be6db3a8b9e18351dfbe7259a8ca98eff044cd1c7ef657356e3960e60745aea63a79bdc73fd009b3bd746bd7 SHA512 64adf577c9d7d79c268cf46c40ed7db23c93cbd49897070d9028ee6636794b1c101d1a9d1ff6f92c24512e18bf0f06b10b67117090918920fb8b8189dec85d4f
 AUX smokeping.service 200 BLAKE2B 77110386e5d304c04d00114800c1f42bb5e8b5ce1eab419afd2fa7c59c1a569fe244c7f7c18e01519d82389bf66f5b6935dd212b3bf68ace9b480e981c311001 SHA512 2f8824143b8283ad02274107c5ed0e84f0c1465fc089823e36ef44a42fec68564d8cc4ff5fb0ad6dc0443e21fac5a8cbcbb0a9bea151b57efaff2a082d15f344
 DIST smokeping-2.6.9.tar.gz 427185 BLAKE2B 3b626d852542f5e9e616ce88a8fd2fd773036822f10f548a1cec242f5d420ec67d940ee49c08da99f7e0815921251cb474b103c8c12c364f90651a4e74e9abf3 SHA512 ab3cec15fd9f90510f902da7ce5bac5915558cac198cc88f0ce193a53a0158c9055e28c8c6671cc6653ac42ab51346e1eb19e537f1ab5c234fd498c6b777499d
-DIST smokeping-2.7.1.tar.gz 8919251 BLAKE2B 91f348b573d5a7ce98e8b51c96d9f45bb0af21cae4b049ba113bfc97c60800d8fdea0c05eb5414ec861f07f30170abf64ee34e0e29899528c01283ddab0ecde8 SHA512 c7208a40725e5694813a0545d6f8b663bab49739fe716bed5fd85ed6258c1c0abde4a18a0678988fff067ecc7807c83313abf12c04b935377b0b7158f07d8626
 DIST smokeping-2.7.2.tar.gz 4614968 BLAKE2B 7cf9f4bd47f3a5419549b0a62fbaca664b70d73af0d57dc005d32030e1e86556f5100d00ed43743aa2a3dffa59bbe00129309b473fc261a7dcdc6225d80a8921 SHA512 e912cdf7ec9af871b9a4a90d787bae04feb21e40c1259bb835eb25b098e03023d7424e53d344ed459f8423260b0eb311f4dd12824195da9647554943685f4d07
+DIST smokeping-2.7.3.tar.gz 6614710 BLAKE2B 7fa10c19487427a3092a1e5591422cb37f66a6eab86b8b43eebbc8af441d5426b99f3c7b54040660f6f150ade99b1ea2555b4fcd6f80d8306d6f86ac9f95974e SHA512 d46d61539ffdd9cac41391aa813364260f90f84443c328b1c9233ab6ba3a0c157861694614e6c33e18b153f6a6afc0769c5fc7752b3ab52f114d984e53232830
 EBUILD smokeping-2.6.9-r1.ebuild 4174 BLAKE2B d9c87bde47edc6665a35152ca6167658ef248e9e8b4a893b53954b553a3acd7af953c193f5f441dab21509e11de4adf91f730c511527c8d57da0c5c10c929533 SHA512 21ecba069f21dadef3baefec04b1ff0d24e732ec4baf99421f6228d498f8b0315bd8b03d4e04c58f51789f4af87c5d05409519bb65cda54e389d0319064c57e2
-EBUILD smokeping-2.7.1-r1.ebuild 4129 BLAKE2B c193fb3280a5a7bde86e64cb3fc593d2f83ee2a57207a30f5ac77b633e486e4797c5eb26e82272e02cc9d76007dbcd774a964b03d6f2601f6a5698c9f7b3d894 SHA512 8044d7d0588d29645f241ffbd3a92210e02ecb0f22259e8b573778a73c69b7e51371b412aead3772622f0b18e37da42c99baa9a0eb71e1ebf3e307486fd04fb3
 EBUILD smokeping-2.7.2.ebuild 4129 BLAKE2B c193fb3280a5a7bde86e64cb3fc593d2f83ee2a57207a30f5ac77b633e486e4797c5eb26e82272e02cc9d76007dbcd774a964b03d6f2601f6a5698c9f7b3d894 SHA512 8044d7d0588d29645f241ffbd3a92210e02ecb0f22259e8b573778a73c69b7e51371b412aead3772622f0b18e37da42c99baa9a0eb71e1ebf3e307486fd04fb3
+EBUILD smokeping-2.7.3.ebuild 4126 BLAKE2B a6178f60eba6bbafa5cebb5755f4011b46e7363579f70d3c18dd34db28cdac4eedf4d86a2529d4b37e7769ee1bc0aba1c66377fd08bc95cb926a1a9fbaaf7797 SHA512 666dd27b11e19c31d0d3cf55c1b99bd282fdc107312551cfeac7245b81b5c9e640bc0adfa514a1df58705d76ab6a5451876319d6e99633003f4657a7698e4192
 MISC metadata.xml 609 BLAKE2B 80a690cf6d514c95f27e370c0417cdc1787a0e149e7791bdd3684b195d2cf6ada9543d1001fd5353a00e05a01c62272b73e09ec838d9ea927b4c3bcbb274ab15 SHA512 cd5bbbf1af0cadf236c3385628a1392c2e5379958e4f002d71230ed9e7627989cfdee7e0a9fd584f94c4c29bb1756f9ade81df0888f4668f9b3a8ab9e31bf727
diff --git a/net-analyzer/smokeping/smokeping-2.7.1-r1.ebuild b/net-analyzer/smokeping/smokeping-2.7.3.ebuild
index 973327b4df83..9dd531b20e11 100644
--- a/net-analyzer/smokeping/smokeping-2.7.1-r1.ebuild
+++ b/net-analyzer/smokeping/smokeping-2.7.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit autotools eutils multilib user systemd
 
 DESCRIPTION="A powerful latency measurement tool"
diff --git a/net-analyzer/sngrep/Manifest b/net-analyzer/sngrep/Manifest
index 4caebdfa5345..5b57af58baa6 100644
--- a/net-analyzer/sngrep/Manifest
+++ b/net-analyzer/sngrep/Manifest
@@ -1,4 +1,6 @@
 AUX sngrep-1.4.5-tinfo.patch 237 BLAKE2B 2ba30ab0828f475e790175d8c3dcd25160ff691194ebb6b8e86380251863b40ef52bd942cdd65c694b84bae8de8d216244f9ab5fa75066e640b8427099a39342 SHA512 7c47e530caa1c44f8452a536925fd1133a1f0aad3822117e5ce2e1b7b03307a90423d70bb031639305b638d4c6732d980f3dbe617adc489fd0c2b438354f5ce6
 DIST sngrep-1.4.5.tar.gz 233379 BLAKE2B b2b080850ad9bc0ab961558781a3c8dd2b0d021d6d5763f6a0fbf56ad20581aeaed3b03804eecc4aa11ef2c8f796f742d990b33fb6d6929a735db7932785bc37 SHA512 428db158146fdf17e8276700a3c32e90d0d4b26b795f0c00eca047b048cf7b66fe20e3f9923823a5240018d1a941d1d32199bfe1bbb8622dc0d813fb0e7d6e73
-EBUILD sngrep-1.4.5.ebuild 813 BLAKE2B c362af76180434f09e4e27dbf2c3f7e6ce271fa12dd6fa9aa1bd705e8f1e243066a700f0f6d4606dbdb1856cf1925d4292c5f7879eb6456f3b1101a8955addc1 SHA512 5b8ee4b365e7c7acb62cf07ed1ee0054289dc8e2058edb5daa6b0671db252cb801a605a14af1f9e81093642ce1c0770d883899c87b4eebe2bc0974081519498c
+DIST sngrep-1.4.6.tar.gz 235721 BLAKE2B e01f2a1d83b9147b99196f7ff2e5562552b16badc2ca634e63b2e2f5955a5d0328c9fcdb841f42a950899511a81fffd8eb64169758dc319875e3052d4359de93 SHA512 25c67e26158b140bded775b217f313ad5a6268684f03d0b9875ddd423d7548b50fa9c358346330d3873984f456aefa9401c2b0fdd136dd95061e34da6530bcc3
+EBUILD sngrep-1.4.5.ebuild 815 BLAKE2B 0bc3571e1c1ea1be12d04c3b5d0dc1959a00a9a0134cf8964d20bb005a32e511925df015537b7e80eceb2bafbb4c8d468365192b92dfa512941421df1ee49427 SHA512 9ddf0718434fdb53dc23cb9cafbd57d8f4875a4111616d7f49f02ad27bdfc5c76fc838061dbc2978d386cd883f270e4f9f248ed35fb9b419ba07f0eddb8e0b8c
+EBUILD sngrep-1.4.6.ebuild 815 BLAKE2B 0bc3571e1c1ea1be12d04c3b5d0dc1959a00a9a0134cf8964d20bb005a32e511925df015537b7e80eceb2bafbb4c8d468365192b92dfa512941421df1ee49427 SHA512 9ddf0718434fdb53dc23cb9cafbd57d8f4875a4111616d7f49f02ad27bdfc5c76fc838061dbc2978d386cd883f270e4f9f248ed35fb9b419ba07f0eddb8e0b8c
 MISC metadata.xml 468 BLAKE2B c4ecbf2a09c6361f3cdd82c6c2280d1885565eb1a834be6093b3acbde6ecad83b49026524c68b067bee7f2764dbf4d3bc73e7e8fc5d13ac499a04001c97b1b30 SHA512 def85ed081107978cef4e8cad0ce80a0717c5c644494ebb907a9a616ad571f13e518019d6d51447f05f1a9545c739dd31874d888cb06ce91ecc224fb2c40e446
diff --git a/net-analyzer/sngrep/sngrep-1.4.5.ebuild b/net-analyzer/sngrep/sngrep-1.4.5.ebuild
index f9c686aba4d0..a6ad92921fd6 100644
--- a/net-analyzer/sngrep/sngrep-1.4.5.ebuild
+++ b/net-analyzer/sngrep/sngrep-1.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="eep gnutls ipv6 openssl pcre unicode"
 REQUIRED_USE="
 	gnutls? ( !openssl )
diff --git a/net-analyzer/sngrep/sngrep-1.4.6.ebuild b/net-analyzer/sngrep/sngrep-1.4.6.ebuild
new file mode 100644
index 000000000000..a6ad92921fd6
--- /dev/null
+++ b/net-analyzer/sngrep/sngrep-1.4.6.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="Ncurses SIP Messages flow viewer"
+HOMEPAGE="https://github.com/irontec/sngrep"
+SRC_URI="${HOMEPAGE}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="eep gnutls ipv6 openssl pcre unicode"
+REQUIRED_USE="
+	gnutls? ( !openssl )
+"
+
+DEPEND="
+	net-libs/libpcap
+	sys-libs/ncurses:*[unicode?]
+	openssl? ( dev-libs/openssl:* )
+	gnutls? ( net-libs/gnutls )
+"
+RDEPEND="${DEPEND}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.5-tinfo.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable eep) \
+		$(use_enable ipv6) \
+		$(use_enable unicode) \
+		$(use_with gnutls) \
+		$(use_with openssl) \
+		$(use_with pcre)
+}
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index 92eccf526059..faf5a0854497 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -1,7 +1,11 @@
+AUX snort-2.9.12-snort.pc.patch 301 BLAKE2B 856d8b12dab5c6d6158f5717fd9e851fd81b62a378bedc9ab485b54bce489730ad76a4340d1eed8f9fb72d07643a939ce61e95e23eaa2b65751cd7755e6027f1 SHA512 0cbd3035a902728927fb1cebe220dd00ed7352c29416129ae7e72ede5549e8a36809ce106cd77fc5f73d03973449ca2f880fd08071c910e1fa00a6a0ebe03c74
 AUX snort-2.9.8.3-no-implicit.patch 299 BLAKE2B 61079829bd82915a8f7b98d9645cb7dda062c3c92558baad9d6052993b3c1f6ea668a1067b5c57e1f570be49e114bb526e45813aff662ff225e88ec4d201d8d6 SHA512 e3cc85c8a8608126880f46220cf889fcd8a7f6819c17bc14cdec2366a0673ec26734637c0185fa4a6be831efdc112678c6f3df08445922d362c79861d0aca832
 AUX snort-2.9.8.3-rpc.patch 1010 BLAKE2B 69301ee21b7efb0bc7f4e3b266de315078d7cbc37a9ae8a4127091bc711650c65f2dc46e0f780a58653fc27606d7116d07a496af7bf7ea3693fc0d69f85b5e63 SHA512 1336fb39ad8f0a5f07c09a5310e4830058b4171fe70b549ad00cba4809f9e18ed0be559abd5c516c5c85b0be90340af3096d5963d9cf098ab26952b1cf93f5a9
 AUX snort.confd.2 420 BLAKE2B 984bc3a1b4f9fea044b150d1362950cc2bc0fae07a92351a88f428befbe1fa35166809dfb9d350cd811bec1dd22f5392910a5f2ee2ec11f20a3dfe6bdff4c4c5 SHA512 f8b0dd74a601a8bfadc96f75caeb037059ba4330dc2b52cc113ce9be38b020f098cbc747bfe977ca4dfa6e2ce634a64949ca5cf41a40c16fa90227e49ac9052f
 AUX snort.rc12 1469 BLAKE2B 6238dfc0f9e178fca864ee9485b8cf59c3056d8b047ee5fd62087f55e8a4627a903aff854827175fc80aaa6ecafa924d9ca57cd9fdba5a185d1e31814db69280 SHA512 ec398f06db147bc8ddf98b0d6a200af40c082053062b56a3fe78b1de6629cd7bf0b188e9baf44c1634f5f9f8ce8494a8a71be63c1e3f71838b77de58dbb45c71
+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.4.6.tar.gz 5338762 BLAKE2B d7d663028fcfeffd2f2996a4ebf81aa723b4564a0aa38158f5fef104385866164d8ddd538d920f08e4102da0b055157c8574e42f2e306187eb82283db5ad2c78 SHA512 e35e22cab3b98bbd42ffb4b88c4c4cc9b1c11e35952a9f3f4f684c02c81ca8604b45d16f42b3d0a6c792eeab86a8e319d8ebdd7b1a5215f93ec0e70b6ef53f98
 DIST snort-2.9.7.0.tar.gz 6340553 BLAKE2B 97fc2699fd93278edd5b350db498733f60ea9a78fe8f9f755c153380be77b3b97caec3aa7cce633650dd0e5d193deab675855aa68c2efcb04dc6df04b77ccb4c SHA512 f2cbdd2cf2ad15bd4cf3f8658c2a4880ee2069589db89c11aaea637984dde270ef6242c6dd43d5e12f829ed2464388950ee791dbbfa8df796843942c415fbc2f
 DIST snort-2.9.7.2.tar.gz 6352738 BLAKE2B c2c67395d9a214886ecf033b692f841da58284d0687ee4c219f77850246b1c2e134b874aba6dfd30dcb1f3c71d54a6c4e5dc70e613eb28a59c51f31dc9498b41 SHA512 4732014d0049671b1a81857e25a5ffbc3cbccb698be2b3406f69a45603a6b9f34343469ee14fa513199cf9b890a278cc777b42493850cff6fcb3493bb9b73dce
@@ -10,6 +14,7 @@ DIST snort-2.9.7.5.tar.gz 6312847 BLAKE2B a8ef86fd5fded47495fe50ee5fcc81d9f066b6
 DIST snort-2.9.8.0.tar.gz 6323095 BLAKE2B f1febbc585e1921af5c599e3d0a4035f38045dd7ea6dd001a6aa9f887a7632e7ad0aecc3fe45f7ba0b44e87dfa50eceeb51df044483baf55ff60ded66cad6867 SHA512 46e5f19be5eccad2d5b4d3d55ce42fe616cd5f605b7178ed98e86cc8f2f4cf0f796fad80033d81b71bea7da2abfb6d0b340815ee158190f9b974f671045bf002
 DIST snort-2.9.8.2.tar.gz 6311793 BLAKE2B 82b4587221a43ade2d6c1d9c38889a5d329d0eb5894bdbd84fac5fa2965ddafc0b1b15f286719a82a8a4df3daf3c20847a298eeae84422867ccefb2d50a7ea71 SHA512 60f660b2093ae88211dcef9256edf35441c0ffc61ec8240b6d25e947b55b0fdb23482913246e2288a8a533dbaff4e5ea2d8f51298ab9aa67baa1ab74d1c4f7a4
 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.4.6-r1.ebuild 8579 BLAKE2B 76c4436513f235a59f382faeb2dac52f224b7936d5c2a31ef97c4609dca055c423228b64d21b8362aababefc1eaeafb60849d8e0593d076b27f060d25f50a2df SHA512 cba04818f77f258dd847869f87aa03be44462da6fcd997e5fea012d9fdd6d9498d24f5e4ec6af5b71dbba4b624b6325585c66457258b2b3536e1a2e45f229535
 EBUILD snort-2.9.7.0.ebuild 8554 BLAKE2B eaf2bd2a509c205c55f7a388dd5cc6f8838aac23848ee0ad191967b4b1955139d91547a4b3eb61237e501f8b39b36a093a8a2e5e489b0f1f2d30f80239b9228c SHA512 ec01e6e3bc88d16da3b25fb99be6377175c4bdc704508aaf5badaec511e43d40de5ce25d34315de7407a1cf8c778e81643eb056ebe1cf0c033fe6ceef6f7c8f6
 EBUILD snort-2.9.7.2.ebuild 8554 BLAKE2B eaf2bd2a509c205c55f7a388dd5cc6f8838aac23848ee0ad191967b4b1955139d91547a4b3eb61237e501f8b39b36a093a8a2e5e489b0f1f2d30f80239b9228c SHA512 ec01e6e3bc88d16da3b25fb99be6377175c4bdc704508aaf5badaec511e43d40de5ce25d34315de7407a1cf8c778e81643eb056ebe1cf0c033fe6ceef6f7c8f6
@@ -20,4 +25,4 @@ EBUILD snort-2.9.8.2.ebuild 8554 BLAKE2B eaf2bd2a509c205c55f7a388dd5cc6f8838aac2
 EBUILD snort-2.9.8.3-r1.ebuild 8347 BLAKE2B 8c7d2738ff0e1ba01b4915f2f4dcb7c37135798118b0ebcc27c5ffba959e830ba84739eb664b436eeaaf98cdf9396a03db6caf515597932ed3dae0c9d4d9a444 SHA512 2dfbb80f30c6051ddc7d090e91715077b97a8e94ffc186d428abda3cf06a9fc8f507d4eebe4bb94dc01e87b1c58869b3d4653ed21057681e8dba96fbdcbd6fd5
 EBUILD snort-2.9.8.3-r2.ebuild 8505 BLAKE2B 82e9e4dbb2527f80ff87f3c95befb2b141e8ca55e1b097581b688c65e990c7cc0206388d98859f47e0f6b0a9ea52d2f6ff566ed67085de4f33c5023e7e4b86dc SHA512 8444c62e53db68fa39a85048b1ce01f30d16d636f4dd5eb3e51a1a5af3e393ca9bf0d4615c44b38bd57de050735b3666222c542c215b08f4f75c49613988a390
 EBUILD snort-2.9.8.3.ebuild 8554 BLAKE2B eaf2bd2a509c205c55f7a388dd5cc6f8838aac23848ee0ad191967b4b1955139d91547a4b3eb61237e501f8b39b36a093a8a2e5e489b0f1f2d30f80239b9228c SHA512 ec01e6e3bc88d16da3b25fb99be6377175c4bdc704508aaf5badaec511e43d40de5ce25d34315de7407a1cf8c778e81643eb056ebe1cf0c033fe6ceef6f7c8f6
-MISC metadata.xml 5023 BLAKE2B 35c2987bcd84a253582bc798a8c2fc1d4b83e9d740686ed6b0831699567227813f239841b908ab78681de1d819b9e094cac66a29e1ca173eece3f372477f04a4 SHA512 752b51aefc9d4136bd44742d239c8e8d83ccd63f1f055ed07741b0adb82bd58954616bd05a6f6d6ecb2fb040a2435f58c6d22b2bce40bac2ba0189bd0d482e8b
+MISC metadata.xml 5278 BLAKE2B 064f738fa204f31a53a5964c755b3c828c38c06c39a5528fbb4860e339e8f8b601f3a07544e74407087551a4aa6b643f975d7109157c8e377f19b99cf8cc430a SHA512 3de9ffe710b163675b0126c9df110222b58191f7f6a6e43c7063f56385ccc780d71fdf4532313a3e6636cebca68a136619bf807772d7aaa04d28e793d92055db
diff --git a/net-analyzer/snort/files/snort-2.9.12-snort.pc.patch b/net-analyzer/snort/files/snort-2.9.12-snort.pc.patch
new file mode 100644
index 000000000000..3608a71c6922
--- /dev/null
+++ b/net-analyzer/snort/files/snort-2.9.12-snort.pc.patch
@@ -0,0 +1,11 @@
+--- a/snort.pc.in
++++ b/snort.pc.in
+@@ -12,6 +12,5 @@ Name: Snort
+ Description: Snort dynamic plugins/detection/rules
+ URL: www.snort.org
+ Version: @VERSION@
+-Libs: -L${libdir} -lcurl @LDFLAGS@ @LIBS@
+-Cflags: @CFLAGS@ @CPPFLAGS@
+-
++Libs: -L${libdir} -lcurl @LIBS@
++Cflags: -I${includedir} @CPPFLAGS@
diff --git a/net-analyzer/snort/files/snort.tmpfiles b/net-analyzer/snort/files/snort.tmpfiles
new file mode 100644
index 000000000000..5772f2fd1ad1
--- /dev/null
+++ b/net-analyzer/snort/files/snort.tmpfiles
@@ -0,0 +1 @@
+d /run/snort 0755 snort snort -
diff --git a/net-analyzer/snort/files/snort_at.service b/net-analyzer/snort/files/snort_at.service
new file mode 100644
index 000000000000..f764015c2192
--- /dev/null
+++ b/net-analyzer/snort/files/snort_at.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Snort IDS system listening on '%I'
+
+[Service]
+Type=simple
+ExecStartPre=/usr/sbin/ip link set up dev %I
+ExecStart=/usr/bin/snort --daq-dir /usr/lib/daq/ -A fast -b -p -u snort -g snort -c /etc/snort/snort.conf -i %I
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+Alias=multi-user.target.wants/snort@%i.service
diff --git a/net-analyzer/snort/metadata.xml b/net-analyzer/snort/metadata.xml
index bfd9b69b2e8f..4478a084a217 100644
--- a/net-analyzer/snort/metadata.xml
+++ b/net-analyzer/snort/metadata.xml
@@ -66,6 +66,11 @@
 			Enable decoding of non-ethernet protocols such as TokenRing, FDDI,
 			IPX, etc.
 		</flag>
+		<flag name="open-appid">
+			Enable OpenAppID, an open, application-focused detection language
+			and processing module for Snort that enables users to create, share,
+			and implement application detection. Requires <pkg>dev-lang/luajit</pkg>.
+		</flag>
 		<flag name="perfprofiling">
 			Enables support for preprocessor and rule performance profiling 
 			using the perfmonitor preprocessor.
diff --git a/net-analyzer/snort/snort-2.9.12.ebuild b/net-analyzer/snort/snort-2.9.12.ebuild
new file mode 100644
index 000000000000..0a355d731945
--- /dev/null
+++ b/net-analyzer/snort/snort-2.9.12.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+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() {
+	emake DESTDIR="${D}" install
+
+	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/tcping/Manifest b/net-analyzer/tcping/Manifest
index 30b2e657b076..521d4ff31560 100644
--- a/net-analyzer/tcping/Manifest
+++ b/net-analyzer/tcping/Manifest
@@ -1,3 +1,3 @@
 DIST tcping-1.3.5.tar.gz 5889 BLAKE2B 8636d1fa4ff65eb14c8fe3c8d6e5b31740b84f0ccc1517b8b35ac613ace3be4b7584b6b7ccd5cf7737c7b7fea678d8d85ac54c00186ce79920dd1756c8c66fd3 SHA512 729360cd1f820ec7c68e2c64365caf60daace8c486c64fe96a88d1037b9818dd27603408962842b74d0db1ee2306ef68522f3f3369c1390e4554929297de760d
 EBUILD tcping-1.3.5.ebuild 590 BLAKE2B a49a9943751d54cdbbced91555399fce50d7d47b64413e8675cd4e9a9803756f28c434985651ae335b84cb42029f2b4ed3bfc075e066c1df4f56cc90becad807 SHA512 27c45d10a1c1d99f7851fe81e7c9b86d138db9cae29feb4e8303e31fcc9d94a5e497a931471837c48f8c3240c5bee7d28852837a47ee7a9d9974c33409531589
-MISC metadata.xml 239 BLAKE2B d243069880f9225abf8b77145dd8c9edbc49f9cd3ce91b8995f16aec20c74534c9e8941a0886c01ee4a2cac5dea72653b8be1b08033252e9f81a76ca9b78bc32 SHA512 be29819db58c3ddb7212a488f9965de11cb5d84223ccae9458e968425296d3ef0f93f20edf7b4ab8a4dda6c166c4104c8b615c82feac5d87b3364a88de591a45
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-analyzer/tcping/metadata.xml b/net-analyzer/tcping/metadata.xml
index d04de4894ede..6f49eba8f496 100644
--- a/net-analyzer/tcping/metadata.xml
+++ b/net-analyzer/tcping/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>xmw@gentoo.org</email>
-	<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-analyzer/thc-ipv6/Manifest b/net-analyzer/thc-ipv6/Manifest
index 266bcc8cda60..3ceb9f7a5b3e 100644
--- a/net-analyzer/thc-ipv6/Manifest
+++ b/net-analyzer/thc-ipv6/Manifest
@@ -5,4 +5,4 @@ DIST thc-ipv6-3.2.tar.gz 1595453 BLAKE2B f1bb1cdc31f4cf4d067b39997ca3cc2d6d8c15e
 EBUILD thc-ipv6-3.0.ebuild 1172 BLAKE2B 24e8c7bc51f3abefdd752003f9bc32da61a83e2af7863afd2ee711a4a52ead7f27ecdf7855ccfa5d9803b763bd233d54bc2f5786f75cfd0ba2dfbd5b88c4f648 SHA512 f8d0288bbfc765ff2f838bb7a402e4c7d15384bc23b34d4a43bb20071b6e2f6f8410e8803d3006ae978235002ee536c6e1551e808d9e31cbce94c85e8970c616
 EBUILD thc-ipv6-3.2.ebuild 1167 BLAKE2B ccc13cadfe360838172cb55255226715c2b8698822e1db045ce32dc001e610224a8a7516d17ad3e562586c3d71dbbcd66acf842b8ee5c181c9d8d86bc0fccace SHA512 01c36f2a68a61c1172e2d346a0f684bec784dc6dd580e4d6fcbbb584819ba073e03d92a472b3fde9fee30498dbf552e002295680c01c92cf2070a19b174f9ce0
 EBUILD thc-ipv6-9999.ebuild 1167 BLAKE2B ccc13cadfe360838172cb55255226715c2b8698822e1db045ce32dc001e610224a8a7516d17ad3e562586c3d71dbbcd66acf842b8ee5c181c9d8d86bc0fccace SHA512 01c36f2a68a61c1172e2d346a0f684bec784dc6dd580e4d6fcbbb584819ba073e03d92a472b3fde9fee30498dbf552e002295680c01c92cf2070a19b174f9ce0
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-analyzer/thc-ipv6/metadata.xml b/net-analyzer/thc-ipv6/metadata.xml
index a535b8852829..6f49eba8f496 100644
--- a/net-analyzer/thc-ipv6/metadata.xml
+++ b/net-analyzer/thc-ipv6/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index 6462d4462cc9..f6fc4bbf383d 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -12,9 +12,11 @@ AUX vnstatd.tmpfile 35 BLAKE2B c56373ebe1abe1111f6927839d79094b6ffd11527ce4e2101
 DIST vnstat-1.17.tar.gz 238397 BLAKE2B 73aaffda3c91a1146b1d6a21f637272be227a15a7964aad90fb76c407c5f7fb0085e6f9f54408e8ebc667475c15f260d701c5924737f20921ebc0a35affd52be SHA512 c9c119a89054dacdc15026c766a20d88336d7689dd4264530d0347fcc58f3cbfc806b271e0f83e76c3b4a31ab793a628ee7d7b696943da919ee4cd2fdb481cc3
 DIST vnstat-1.18.tar.gz 242502 BLAKE2B 2190c33ddf1c0a573e638234a94a86eb44fcc39e106ce8ece1f5ee5314dcc1efee237376ec109eb0873b9cf27ac3fe663526512f98a130114d417380bcb82a31 SHA512 4f9f08a57586bc57ede3d66802ee977c69b5f76ab42aa36e942e8d827dfce806dfc04916646fac01f57b026742a639fc5f7395b141a1c03ad11a1f977d02aa68
 DIST vnstat-2.0.tar.gz 259439 BLAKE2B f28f10962ae2acf04fc6669268bf5cf911ca2a5c77422b773f82a1ae25a0f90c2022aa5981c701bfa0246340113e24e0c3854174f6b3bee17d5474b9ba0916f0 SHA512 d5c9012b692adc9032ca1abde8619bd6a5de53c7c03b0fcae5b4b901c9769285a9de0b3a4f1bc21cfd74b96cfb10130a95e90cf179126ea676a777e1a9579a62
+DIST vnstat-2.1.tar.gz 259622 BLAKE2B 703e1260d0ea81a016ed89dbfa830f97ff6e38ca2dd4c96ea08ca8293e71cde8cf0048e6a68b9cb6f2f94aaec66764bbfc718173897d40fd6e8166c07d7e627c SHA512 4c88795ee254cb550873e7db72a5f7b795553ef944c3f4df4c351e83376ea02ae6f3376b01edf727072fe2ba178372705a73483c24269acc4c173ee0e03f8930
 EBUILD vnstat-1.17-r3.ebuild 1516 BLAKE2B c1638aa8e9ae4f36fb1490e7133e48fcab98c2368ea2f673c3449dde1bbf1c4211209c2865837ccc1355fc9e635e7100430447b8906516369da45922f35ff9ca SHA512 49d2f2cc331e380d66dceedeab8ed04e5f9767f4efabc2cc3211618cdc2abcc949cc72038abd15cc89e57b7e2dfe672e27bbcf7e3a768d084dab93200786b447
 EBUILD vnstat-1.17.ebuild 1432 BLAKE2B 670816f4084b10dd622dd9ab90d95c01f185d9d7a51bddd430c5cb0b0fd7900b5cf3417310b814a7299102978c9d4f165e0991978defb025e2935f9922715059 SHA512 669b9f5f8638dcca0c97d2f1c0a160bbfbf24ac5dfa6c4e3c0d6b1280dc6fb5923c512924397576ccbe75c762464fa93aa4022c524fd167800da1c5195e8c9b4
 EBUILD vnstat-1.18.ebuild 1516 BLAKE2B c1638aa8e9ae4f36fb1490e7133e48fcab98c2368ea2f673c3449dde1bbf1c4211209c2865837ccc1355fc9e635e7100430447b8906516369da45922f35ff9ca SHA512 49d2f2cc331e380d66dceedeab8ed04e5f9767f4efabc2cc3211618cdc2abcc949cc72038abd15cc89e57b7e2dfe672e27bbcf7e3a768d084dab93200786b447
 EBUILD vnstat-2.0.ebuild 1528 BLAKE2B 757d07cd46bfd69e4095401ea4380ef235a7cce65c81274f694fe9f243345b26bc9d997a4442edac1ce6cc3f700057208a2992107a22e31292b5cb6ffcc2f268 SHA512 c61469e9817aa4c15e0bb1d8a7438e5f2cc5af01c9a9cc6f2429c5c180662a0eb38de51e6780984deb7d6070e55bdd8e9f8afbd0ac8d74c5042bd66fd960dabd
+EBUILD vnstat-2.1.ebuild 1528 BLAKE2B b9c5a2bb6af9f75f1576605a295a9beccbe17f031538132c592c04d1747936e92ca1d308342fe230996c7b330d32ab6356232a0ba05b7cebddc93c0b15a368b3 SHA512 84cfa2c2b275fdaec4c31586fb98736481c21f5cb7fe60e1a52eff45094712d631d370126e2fcb064d5ef72c46d79caa23938bb62f4b1c052ebdf6f1625c459a
 EBUILD vnstat-9999.ebuild 1499 BLAKE2B 55e75f51d727d550b7ce56ff65d8a14bd493ca074df2114ae18b1dad10061d1493f8e27ca28584b59730a3b75fbe7c5400c022174695362b864c3ebc7ac93526 SHA512 b618e04b5ffd88b00f9e0f744db908f2e637ef422b17889f12dedeec3f9d4e22e0f6161c4ea065ab3eac737b8ea711f8256aba0c9822f49af0a5fd7cf52a0e20
 MISC metadata.xml 603 BLAKE2B 6cd01f8334d5768e057d6866f9c8d739af3680787d9159638a504eeeb74b2f01a36775bfa3e2afeb169d2948e290e8995b2100d572603eaa5ffa44c96b15b385 SHA512 7dbda5d3a317201c8eb0000f2b55af6b2de6fd44368ab39b08c60ee8eb1355264a8886d9a484ab75d47c0c0ce3f41059a8f354f7d6480ae20e469e4c29ca31e2
diff --git a/net-analyzer/vnstat/vnstat-2.1.ebuild b/net-analyzer/vnstat/vnstat-2.1.ebuild
new file mode 100644
index 000000000000..b28272d8b5d6
--- /dev/null
+++ b/net-analyzer/vnstat/vnstat-2.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit systemd user
+
+DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
+HOMEPAGE="https://humdi.net/vnstat/"
+SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gd selinux test"
+
+COMMON_DEPEND="
+	dev-db/sqlite
+	gd? ( media-libs/gd[png] )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( dev-libs/check )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-vnstatd )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.17-conf.patch
+	"${FILESDIR}"/${PN}-1.17-drop-root.patch
+	"${FILESDIR}"/${PN}-1.17-run.patch
+)
+
+pkg_setup() {
+	enewgroup vnstat
+	enewuser vnstat -1 -1 /var/lib/vnstat vnstat
+}
+
+src_compile() {
+	emake ${PN} ${PN}d $(usex gd ${PN}i '')
+}
+
+src_install() {
+	use gd && dobin vnstati
+	dobin vnstat vnstatd
+
+	exeinto /usr/share/${PN}
+	newexe "${FILESDIR}"/vnstat.cron-r1 vnstat.cron
+
+	insinto /etc
+	doins cfg/vnstat.conf
+	fowners root:vnstat /etc/vnstat.conf
+
+	keepdir /var/lib/vnstat
+	fowners vnstat:vnstat /var/lib/vnstat
+
+	newconfd "${FILESDIR}"/vnstatd.confd-r1 vnstatd
+	newinitd "${FILESDIR}"/vnstatd.initd-r2 vnstatd
+
+	systemd_newunit "${FILESDIR}"/vnstatd.systemd vnstatd.service
+	systemd_newtmpfilesd "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf
+
+	use gd && doman man/vnstati.1
+	doman man/vnstat.1 man/vnstatd.1
+
+	newdoc INSTALL README.setup
+	dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
+}
diff --git a/net-analyzer/w3af/Manifest b/net-analyzer/w3af/Manifest
deleted file mode 100644
index cd2053b519f4..000000000000
--- a/net-analyzer/w3af/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX w3af_console 45 BLAKE2B c052b540207b91e6dc97e4f038fcfa092d887229190d5a7aea889ce28790b7d4d1a959b6f6d18b7eb1bd9d00d9c972fd5934e4fb7d92a1c7fdeaf82bf5e907f2 SHA512 e8353393663d892f0f362a03e9459383cb8cf2de87a4bdd135f6c7fbc289cc34a236abf514dcfb9d9a3c573e2e5747c06c819527b1b0051c9513130cd0047a21
-AUX w3af_gui 41 BLAKE2B c719edcc991f5cd9f793c9d38f6c59652aba9c1c1b3fd74e651e4610977a9e30abfec3dceaa1b9b79c56773fa1c51d7a6d069d154dd6e1a831dfee88b03ae265 SHA512 1fd52f555d9fe3ebf7c8a985d83e7f86eb6e9a379589c50c567ed12c54abb63125ccd21b028215a87acb533aa45ec8fd8dc3169a3c9cbe090b8d32f2a9b751ca
-DIST w3af-1.1.tar.bz2 39994121 BLAKE2B e7f2fbb26360149dcffbd70b3cd2bb66a44019fc31962f9e7ce73e4dc417b8b44b656cb44d2f0f0c6fd51d6900865d3d3f839a27796b533e81d2ec003b9392f2 SHA512 9a6c7d474d61f9039c150b44d4c6027451d58e925e47083262105f62b0fca718373103015e3f5bbed1cb89a40c9c057d3d54ce0c533ad3cc90e8ff24e193f868
-DIST w3af-1.5.tar.gz 31147412 BLAKE2B 1ef8d22143925f7958539179b01ec1a4ae3e10a71c62cabc9b4644de56fc050312ce23df339a28451040a7c31262177d47a8280e6ce979ec93db5ea26880e512 SHA512 5b0b83e36b35883bd78fe990e9e5f0c955e49a22421d8eee4ec877cda842e79c8af0b490f0927ea253bdd60b957fbacf7ad1116e2c3d93023f160691aa50ce7e
-EBUILD w3af-1.1-r1.ebuild 1884 BLAKE2B 0d5704af0225b05f40e71ff749107de90251368d5114b5c31a7691726789b0e83ae1c0152672b45fe758269640fc39570853e30ced7cf9b0bd27c62bf8793e2f SHA512 51d625b9517c6575d66da139d73b4c04879d49aba12dc0cb7900e96f44131719ad0211871a1a1672257beec0019c4eef0031852580b0464bfcb1608c385f5631
-EBUILD w3af-1.5.ebuild 2348 BLAKE2B ac8cab145bbc5b9ecdef72a038364c7aa60f30f97566de2b09cca2e144b20b3fbde76e77480705b007ac2ad56c7f6c94a363fd3d6bdb72beac91b9474b032d36 SHA512 84f76244a37fcb30edfca70b64700eb06093027d6f66624522cceee4e9c9ba54bd466fa7fc1f8e69ddcee70c3d919456e9a1e70d592cdaff8435a7ed67fea32f
-MISC metadata.xml 300 BLAKE2B d1a82226de14f9c975621325dd9136163f93c2158a3f7808b01479b46a8ee1fe405543138e60546e31cbc16456c8444ba91ed029f14ca3b8cb2d5d2ff31ed55f SHA512 2b9d8b958caf6e5e4cc4374aea404206220f55574a84b2865d0bda61bec24499f5033ad2381c4513c197195b68b4b949cd722112e5177f1e3112d93c9f388c60
diff --git a/net-analyzer/w3af/files/w3af_console b/net-analyzer/w3af/files/w3af_console
deleted file mode 100644
index 93212cefb237..000000000000
--- a/net-analyzer/w3af/files/w3af_console
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /usr/lib/w3af
-./w3af_console $*
diff --git a/net-analyzer/w3af/files/w3af_gui b/net-analyzer/w3af/files/w3af_gui
deleted file mode 100644
index 41f4802e3ae1..000000000000
--- a/net-analyzer/w3af/files/w3af_gui
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /usr/lib/w3af
-./w3af_gui $*
diff --git a/net-analyzer/w3af/metadata.xml b/net-analyzer/w3af/metadata.xml
deleted file mode 100644
index 573e0af10300..000000000000
--- a/net-analyzer/w3af/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">andresriancho/w3af</remote-id>
-		<remote-id type="sourceforge">w3af</remote-id>
-	</upstream>
-</pkgmetadata>
-
diff --git a/net-analyzer/w3af/w3af-1.1-r1.ebuild b/net-analyzer/w3af/w3af-1.1-r1.ebuild
deleted file mode 100644
index a2a89f6c86f3..000000000000
--- a/net-analyzer/w3af/w3af-1.1-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit multilib python-single-r1 versionator
-
-MY_P=${PN}-"$(replace_version_separator 2 '-')"
-
-DESCRIPTION="Web Application Attack and Audit Framework"
-HOMEPAGE="http://w3af.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc gtk"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/fpconst-0.7.2[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/nltk[${PYTHON_USEDEP}]
-	dev-python/pybloomfiltermmap[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pyPdf[${PYTHON_USEDEP}]
-	dev-python/python-cluster[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	dev-python/soappy[${PYTHON_USEDEP}]
-	dev-python/pysvn[${PYTHON_USEDEP}]
-	|| (
-		net-analyzer/gnu-netcat
-		net-analyzer/netcat
-		net-analyzer/netcat6
-		)
-	>=net-analyzer/scapy-2
-	gtk? (
-		media-gfx/graphviz
-		>dev-python/pygtk-2.0
-		dev-python/pygtksourceview
-		)"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S=${WORKDIR}/${PN}
-
-src_prepare(){
-	rm -r extlib/{cluster,fpconst-0.7.2,pyPdf,SOAPpy,yaml} || die
-	sed -i 's,extlib.pyPdf.,,' core/data/parsers/pdfParser.py || die
-	rm readme/{GPL,INSTALL} || die
-	rm plugins/attack/payloads/code/netcat || die #bug 349780
-	esvn_clean
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/w3af
-	doins -r core extlib locales plugins profiles scripts tools w3af_gui w3af_console
-	fperms +x /usr/$(get_libdir)/w3af/w3af_{gui,console}
-	dobin "${FILESDIR}"/w3af_console
-	use gtk && dobin "${FILESDIR}"/w3af_gui
-	#use flag doc is here because doc is bigger than 3 Mb
-	if use doc ; then
-		insinto /usr/share/doc/${PF}/
-		doins -r readme/*
-	fi
-	python_fix_shebang "${ED}"usr/$(get_libdir)/${PN}
-}
diff --git a/net-analyzer/w3af/w3af-1.5.ebuild b/net-analyzer/w3af/w3af-1.5.ebuild
deleted file mode 100644
index 857b058864f1..000000000000
--- a/net-analyzer/w3af/w3af-1.5.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit multilib python-single-r1
-
-DESCRIPTION="Web Application Attack and Audit Framework"
-HOMEPAGE="http://w3af.sourceforge.net/"
-SRC_URI="https://github.com/andresriancho/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc gtk"
-
-#w3af seems to ship sqlmap? maybe we should split this out...
-
-QA_PREBUILT="
-	usr/$(get_libdir)/${PN}/plugins/attack/db/sqlmap/udf/mysql/linux/32/lib_mysqludf_sys.so
-	usr/$(get_libdir)/${PN}/plugins/attack/db/sqlmap/udf/mysql/linux/64/lib_mysqludf_sys.so
-	usr/$(get_libdir)/${PN}/plugins/attack/db/sqlmap/udf/postgresql/linux/*/8.2/lib_postgresqludf_sys.so
-	usr/$(get_libdir)/${PN}/plugins/attack/db/sqlmap/udf/postgresql/linux/*/8.3/lib_postgresqludf_sys.so
-	usr/$(get_libdir)/${PN}/plugins/attack/db/sqlmap/udf/postgresql/linux/*/8.4/lib_postgresqludf_sys.so
-	usr/$(get_libdir)/${PN}/plugins/attack/db/sqlmap/udf/postgresql/linux/*/9.0/lib_postgresqludf_sys.so"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/fpconst-0.7.2[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/nltk[${PYTHON_USEDEP}]
-	dev-python/pybloomfiltermmap[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pyPdf[${PYTHON_USEDEP}]
-	dev-python/python-cluster[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	dev-python/soappy[${PYTHON_USEDEP}]
-	dev-python/pysvn[${PYTHON_USEDEP}]
-	|| (
-		net-analyzer/gnu-netcat
-		net-analyzer/netcat
-		net-analyzer/netcat6
-		)
-	>=net-analyzer/scapy-2
-	gtk? (
-		media-gfx/graphviz
-		>dev-python/pygtk-2.0
-		dev-python/pygtksourceview
-		)"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare(){
-	rm doc/{GPL,INSTALL} || die
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/${PN}
-	doins -r core locales plugins profiles scripts tools w3af_gui w3af_console
-	fperms +x /usr/$(get_libdir)/${PN}/${PN}_{gui,console}
-	dobin "${FILESDIR}"/${PN}_console
-	if use gtk ; then
-		dobin "${FILESDIR}"/${PN}_gui
-	else
-		rm "${ED}"/usr/$(get_libdir)/${PN}/w3af_gui
-	fi
-	#use flag doc is here because doc is bigger than 3 Mb
-	if use doc ; then
-		insinto /usr/share/doc/${PF}/
-		doins -r doc/*
-	fi
-	python_fix_shebang "${ED}"usr/$(get_libdir)/${PN}
-}
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 7a557e676330..3d1e3513c4f9 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -6,15 +6,20 @@ AUX wireshark-2.6.0-androiddump-wsutil.patch 640 BLAKE2B 07e8bbb0a892d35fc58d63c
 AUX wireshark-2.6.0-redhat.patch 248 BLAKE2B a3cc5af29cea1b46cc8456c80a1ddf3a0db464f1274beba49c440af831d708bf251ad7481231f27bd7d7f99cf50f964e7f8aa80ce3c0f4d3b06f00ce624f7347 SHA512 92d498c7b6c3a4ae461f5bbca090943dbd7a3151628eebd4b212f3d9eca133260fe46bc72c6bec8444a83517d7a69c334257c61f9fd8e1256f71dd70241e3f66
 AUX wireshark-2.6.2-qtsvg.patch 548 BLAKE2B a86981841b4bd76c429d68bb94439317c29404a8917ee8419b7f9e729e857a6dafb94c738f656633672f4f31a8a0e3ccc6a1946b6db3a15b27244cf5ab34a7e5 SHA512 08530766e3e3e3273847a7147303c0bbb0f2b9230e54f057fe4e266ea4f67d577d301a4c02e63d69bb5cdeaf0445466c906278ab76e636a0f2bb8a886eb21ddc
 AUX wireshark-2.6.3-docbook.patch 1457 BLAKE2B 8e0c940b522a9ec11781f594c30343a3b9b2b81b70c91bfe5afbf36b3e1a341374a7182bdb317a2738de5e0a1dbf98b709d19d2f339a305be9e46d8f2303c17e SHA512 181f259a6330204bde89ddf8bf8ea10a80b3c47c25eb252060acd820dbf8cca2c4b390af765fd174722e909ec7a9fd903245bcce1f6d7f82fecd3e26994bbf19
-AUX wireshark-99999999-androiddump-wsutil.patch 655 BLAKE2B 46ebdd2d22a5e7b0af061ae18e4bfaa6ba25c30353e08dbe146489d64c242cec4d80c261b4159d5581b6a8343d1fee7dc928a6194720daecfc4ae0efa5a8d47e SHA512 d3c79efaf922e4d018150281e73c5a40914019f6189baa8b097e88ac513ac80b0cdd560e78ff817bb4e69e3c5239190eac8c9adc0138d264f686c4924a680ef9
+AUX wireshark-2.9.0-tfshark-libm.patch 134 BLAKE2B 364acc14eaf74d134b9905c240a3a6074138a259ce6a0a4a08496884d34961cbcbcba6204a47c62e015207d551abe5c5b30430333f185773347157162a027d4d SHA512 5cbbe6fc9aef5f26216ede7e5ece4fa8b5e2aeebc478c761a8b5ee5310f24fef8b2588fc04938fa9bfc4875d6df2835f82b4d15c4b818f9ac500d2fc2465d362
+AUX wireshark-99999999-androiddump-wsutil.patch 343 BLAKE2B 665e3329615524fa145b0b6f996aa950f0337ef4fd6a53d26887453744f8f3dcbcd499654f679edd07d2e07224e542247583233a8c0be1d130bc9196dc56ee01 SHA512 9f013bb9fd7d0dad834c2079210a1b15adbd5650a7fc320e7dfab7c9c6d0fa9f0b4e3fd3b1972f91ec47484933244c6b91dfbf4eb62409391562bc7ee4ee7f5e
 AUX wireshark-99999999-androiddump.patch 202 BLAKE2B 31548a778c4a3b799bad8f920221ca7ccf774702e8018f982e00318afbaac174d4e7ae961fefd448cc56dca6b7d0448a2ac99d1e5afacb61a37de0546ee3557e SHA512 a9794c5bcb1d288c113e84b03ac4f185e6fb7bccc16aefa3311ebd37aab7e9d5c715022f5b54032812ac2ab1244c65d9fd716c826ee27e677b011976f218f9da
 AUX wireshark-99999999-qtsvg.patch 900 BLAKE2B 309fa6d8f64962c2d255d6325b062e3adcbd8bdd98d25bd7d49d017375e4bd8a1d75cb4fe941f1f6f2785ef3b4a012309a59d12b562103a1d875e4d9d3f409a4 SHA512 a9df139cd58d8ddb84c019f1839087ccad63152102734e00191e2ab2191ae93c7b830121e5b3ad6efca5c26cd215f48f9e152045b37c17362adf2d7807af632b
 AUX wireshark-99999999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3
 DIST wireshark-2.4.5.tar.xz 28836740 BLAKE2B 797540daca259a2d5d7dc6e637f2b504b6d14191af4040e6b344c95db6c776b7de80c25c59c98ab84d0337cc96c7313b42c13103a3c3944768a793130deae258 SHA512 2f2c201d6b8a37dcbe03bc9affbf97d632d8e40e4fe5b3a3e79cbd5cfbeb5b9111919850546ccae355fcb042def3456438eb1c4d73f7d56d373e7898311b42f3
 DIST wireshark-2.6.3.tar.xz 28384004 BLAKE2B f275c73173fbaf3f819c58f28859362e9c53ae50cf2649ac42c8d172362241eb00d7f43d0aead184ec67cb8da34d405124be10c5bf31226c2cb4800b8a01955b SHA512 87e5335840baa401a1064ee83e3f0ee859c059dd37a09f63f19eb5d91ad273e84f1c0e7a8fdd63fe8a7076abff5e79593827544c5796d921cf7dc7682c7c3f80
 DIST wireshark-2.6.4.tar.xz 28218232 BLAKE2B d54d7661801667f78f0c3248f4099c77ef016222ae942dc7a5776af2c5c18f7b00305556ac84df6afd19cf3d2bd59e78365067dd9402f978ae0a7db76c1730ca SHA512 bc740548901b30f2e44c2b0933717288615fa38edc5e092607a8b12c60ecfacaa5aa7c59d7644cf29238d0d636fbe03d85559a0f2de81a3bf8ceac55fcf9ff07
+DIST wireshark-2.6.5.tar.xz 28390292 BLAKE2B f9847ef113b0c63e739be305603b42c5112da2e94b3110b9b104325af97801bd2b3d9d89cd334b59d460433520069cc2ba726e96aa9f22af112a28a653b9e29c SHA512 fed2d08bb0ba06496c22a5d45946faf2ff4ca19c59faf758c668c583193faeec3c4379b64750478469fede91562891e9b6991591a09a3da8d2193cb64718d02f
+DIST wireshark-2.9.0.tar.xz 29438416 BLAKE2B 17bbffe6e079133c4319a49a3672a4359b9e8eed1493b7440a2924c4bd57c45a1cbeee2ee50d4f3d96cbda436fa48eb6ba66bc61061f5fdbf71d1711c5467b43 SHA512 f24d873d75510488e0e60f75abce5820457786ff540ede3fb19fd45fea269527323ef5b5157ff83d2aaeabd60d03bac0a3dfc14495468d9478a8e5d7a30ad47b
 EBUILD wireshark-2.4.5.ebuild 7324 BLAKE2B 37579953238776d82c3887994830e72d6df6b928471f6d5ae955c53a58b0b70887c139c0962d5a27119da15ec6af0e416793d41ea3aa4ee18374f441abec0876 SHA512 f8fa063eff8b7c3e76fe2861b287a8c65368710b2cdbec670453a54e5d629a060dc368d05a6c6efb2ad8031174613026c79a3d8eea9fe9e43caa3953e5a72d74
 EBUILD wireshark-2.6.3.ebuild 6603 BLAKE2B b9406cf5e104ab342ff8b9eaedd2b0a01b79b6f0bd6a79657c2860d53fcb648cb5868b97ec559b9cce5cdd9ed0ef5cb985edcfd093e60da16dbb42035cabec23 SHA512 95f5f555a393ce995c55a8dee07189fac90fc3032642dcecbf0f50e777d3bc919321d048c68e9bda3553ded1c92383235804cd47f6e0c9aa3303d116684e60d3
 EBUILD wireshark-2.6.4-r1.ebuild 6514 BLAKE2B 0203f94f5919cf7ee0d9434cdaea93383cc816568886fe050da346cd6bf285967214c3d75d579b76c130b9d41bcfaae81b02fb1b5865a46a3dccac81818371be SHA512 57b01b0093b4cb9cf083df51451c198fe740e34bc08e3709ae546df696681813c1dd89d582e68af72a41ca7318adec1ebe4d027ddb464ced5cab13622b239400
-EBUILD wireshark-99999999.ebuild 6323 BLAKE2B 0d65cabecbbba46d9e2164dc29024542d4497b80e5694dc004e7a1e2317f903b0df135b40d785150b1661dfe1f90ce12f4ab072391bdb04e88e5d8f4df582c44 SHA512 d422f24094189a03cef3947f1d1b05ad6537a0725572d23fd1060202a50ac8ede3cd9cbbe2da6eaa66bd55b560b66a2526b778c8073a54d799117089d0b4b5e2
+EBUILD wireshark-2.6.5.ebuild 6517 BLAKE2B 61bacb528d11a3312b1f9a5208ef8b59674f1174ec4d66c880ab0fe40a6a77f499e315c8ff81e37d6e543a0ea45444195c789965d9776d797def00b1b7bf6434 SHA512 b897b6bbc389fb81ae54ea6556974007824e639fdd958e2478607dc45610ce0177032421cffaf1b3fdf18ad3b03d90f70c6696b1fb225a86d213bb13cb3f2369
+EBUILD wireshark-2.9.0-r1.ebuild 6407 BLAKE2B 7d3335139c47b88c547903736cc03f4dfa6a09849fbe16725e622e1d3ecfc5b30790cabb12a30e6eb8465db4f651f4b52bf70ed5d9a2fefd7c23e63296980669 SHA512 cd11911051e20402ceee753682c88ce452f3c404666a8b9f65d14e58b5e4f243bce61f5b62ba50d56b3c863012fd6a53a097ff8bbf3776b279fc72b503e96a9b
+EBUILD wireshark-99999999.ebuild 6370 BLAKE2B 0eb32ecf1f3fa6645af1c66f552e9971d4ef9b9b1697823551ab9158cd54c18f8b5b8d65ee379d0cfd7034d72c7afa0a6e8d1d474673ed13461eff9780b4a9d0 SHA512 3685a02a533e54bbe2117621c324d17c681286c9e33ac5e48eab502224494e1b9bfb181c372433cb19c4d7aa5b5e79d79b5004702d325356fe8cdfba3c345d8f
 MISC metadata.xml 4787 BLAKE2B dcdb28c47094cfddc0effc4c16aa9132386f94d4d6e6cdb46f31a06ebb5dd7cd5c7bf967f50c6a002b7aeecddeb8aa8b86cb5961405a463c10389d6ec9b5cb7f SHA512 b683b159266bc37471ef26f6c0c4b2e94f72d2a77a2a7647e28b8b49e611973522af294c39050dbfa8aa5cca65bf2670f9d4c1e6a93d01b386e76f1ab75ff2e9
diff --git a/net-analyzer/wireshark/files/wireshark-2.9.0-tfshark-libm.patch b/net-analyzer/wireshark/files/wireshark-2.9.0-tfshark-libm.patch
new file mode 100644
index 000000000000..40082c435010
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-2.9.0-tfshark-libm.patch
@@ -0,0 +1,10 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2314,6 +2314,7 @@
+ 
+ if(BUILD_tfshark)
+ 	set(tfshark_LIBS
++		m
+ 		ui
+ 		wiretap
+ 		epan
diff --git a/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch b/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch
index 4c6ddceeea67..9715de676f16 100644
--- a/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch
+++ b/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch
@@ -17,11 +17,3 @@
  			${GLIB2_LIBRARIES}
  			${ZLIB_LIBRARIES}
  			${CMAKE_DL_LIBS}
-@@ -89,7 +92,6 @@
- 	)
- 
- 	add_executable(androiddump WIN32 ${androiddump_FILES})
--	# XXX Shouldn't we add wsutil to androiddump_LIBS instead?
- 	set_extcap_executable_properties(androiddump)
- 	target_link_libraries(androiddump ${androiddump_LIBS})
- 	install(TARGETS androiddump RUNTIME DESTINATION ${EXTCAP_DIR})
diff --git a/net-analyzer/wireshark/wireshark-2.6.5.ebuild b/net-analyzer/wireshark/wireshark-2.6.5.ebuild
new file mode 100644
index 000000000000..3850eda718fa
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.6.5.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils eutils fcaps flag-o-matic gnome2-utils ltprune multilib qmake-utils user xdg-utils
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/"
+SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86"
+IUSE="
+	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc
+	+dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
+	nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump +reordercap sbc selinux
+	+sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump
+	zlib
+"
+
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+	>=dev-libs/glib-2.14:2
+	dev-libs/libgcrypt:0
+	netlink? ( dev-libs/libnl:3 )
+	adns? ( >=net-dns/c-ares-1.5 )
+	bcg729? ( media-libs/bcg729 )
+	filecaps? ( sys-libs/libcap )
+	gtk? (
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:3
+		x11-libs/pango
+		x11-misc/xdg-utils
+	)
+	kerberos? ( virtual/krb5 )
+	sshdump? ( >=net-libs/libssh-0.6 )
+	ciscodump? ( >=net-libs/libssh-0.6 )
+	libxml2? ( dev-libs/libxml2 )
+	lua? ( >=dev-lang/lua-5.1:* )
+	lz4? ( app-arch/lz4 )
+	maxminddb? ( dev-libs/libmaxminddb )
+	nghttp2? ( net-libs/nghttp2 )
+	pcap? ( net-libs/libpcap )
+	portaudio? ( media-libs/portaudio )
+	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 )
+	smi? ( net-libs/libsmi )
+	snappy? ( app-arch/snappy )
+	spandsp? ( media-libs/spandsp )
+	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}
+	dev-lang/perl
+	!<virtual/perl-Pod-Simple-3.170
+	!<perl-core/Pod-Simple-3.170
+	doc? (
+		app-doc/doxygen
+		dev-ruby/asciidoctor
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+RDEPEND="
+	${CDEPEND}
+	gtk? ( virtual/freedesktop-icon-theme )
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
+	"${FILESDIR}"/${PN}-2.4-androiddump.patch
+	"${FILESDIR}"/${PN}-2.6.0-androiddump-wsutil.patch
+	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+	"${FILESDIR}"/${PN}-2.6.2-qtsvg.patch
+	"${FILESDIR}"/${PN}-99999999-androiddump.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
+
+	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_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_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)
+		-DBUILD_wireshark_gtk=$(usex gtk)
+		-DDISABLE_WERROR=yes
+		-DENABLE_BCG729=$(usex bcg729)
+		-DENABLE_CAP=no
+		-DENABLE_CARES=$(usex adns)
+		-DENABLE_GNUTLS=$(usex ssl)
+		-DENABLE_KERBEROS=$(usex kerberos)
+		-DENABLE_LIBXML2=$(usex libxml2)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_LZ4=$(usex lz4)
+		-DENABLE_NETLINK=$(usex netlink)
+		-DENABLE_NGHTTP2=$(usex nghttp2)
+		-DENABLE_PCAP=$(usex pcap)
+		-DENABLE_PORTAUDIO=$(usex portaudio)
+		-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_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 gtk || 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
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_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() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-analyzer/wireshark/wireshark-2.9.0-r1.ebuild b/net-analyzer/wireshark/wireshark-2.9.0-r1.ebuild
new file mode 100644
index 000000000000..ef9526baa665
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.9.0-r1.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+inherit cmake-utils eutils fcaps flag-o-matic gnome2-utils ltprune multilib python-r1 qmake-utils user xdg-utils
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/"
+SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86"
+IUSE="
+	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc +dumpcap
+	+editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink nghttp2
+	+pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy
+	spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump zlib
+"
+
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+	>=dev-libs/glib-2.32:2
+	dev-libs/libgcrypt:0
+	adns? ( >=net-dns/c-ares-1.5 )
+	bcg729? ( media-libs/bcg729 )
+	ciscodump? ( >=net-libs/libssh-0.6 )
+	filecaps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	libxml2? ( dev-libs/libxml2 )
+	lua? ( >=dev-lang/lua-5.1:* )
+	lz4? ( app-arch/lz4 )
+	maxminddb? ( dev-libs/libmaxminddb )
+	netlink? ( dev-libs/libnl:3 )
+	nghttp2? ( net-libs/nghttp2 )
+	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 )
+	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}
+	!<perl-core/Pod-Simple-3.170
+	!<virtual/perl-Pod-Simple-3.170
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-ruby/asciidoctor
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4-androiddump.patch
+	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+	"${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch
+	"${FILESDIR}"/${PN}-99999999-androiddump-wsutil.patch
+	"${FILESDIR}"/${PN}-99999999-qtsvg.patch
+	"${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch
+)
+
+pkg_setup() {
+	enewgroup wireshark
+}
+
+src_configure() {
+	local mycmakeargs
+
+	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
+	if use kerberos; then
+		case $(krb5-config --libs) in
+			*-lcrypto*)
+				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
+				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
+				ewarn "license and the GPL, so do your check before distributing such package."
+				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
+				;;
+		esac
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	fi
+
+	python_setup 'python3*'
+
+	mycmakeargs+=(
+		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
+		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
+		$(usex qt5 MOC=$(qt5_get_bindir)/moc '')
+		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
+		$(usex qt5 UIC=$(qt5_get_bindir)/uic '')
+		-DBUILD_androiddump=$(usex androiddump)
+		-DBUILD_capinfos=$(usex capinfos)
+		-DBUILD_captype=$(usex captype)
+		-DBUILD_ciscodump=$(usex ciscodump)
+		-DBUILD_dftest=$(usex dftest)
+		-DBUILD_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_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)
+		-DDISABLE_WERROR=yes
+		-DENABLE_BCG729=$(usex bcg729)
+		-DENABLE_CAP=$(usex filecaps caps)
+		-DENABLE_CARES=$(usex adns)
+		-DENABLE_GNUTLS=$(usex ssl)
+		-DENABLE_KERBEROS=$(usex kerberos)
+		-DENABLE_LIBXML2=$(usex libxml2)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_LZ4=$(usex lz4)
+		-DENABLE_NETLINK=$(usex netlink)
+		-DENABLE_NGHTTP2=$(usex nghttp2)
+		-DENABLE_PCAP=$(usex pcap)
+		-DENABLE_SBC=$(usex sbc)
+		-DENABLE_SMI=$(usex smi)
+		-DENABLE_SNAPPY=$(usex snappy)
+		-DENABLE_SPANDSP=$(usex spandsp)
+		-DENABLE_ZLIB=$(usex zlib)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_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
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_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() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 325185d09e21..1971febe690d 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit cmake-utils eutils fcaps flag-o-matic git-r3 gnome2-utils ltprune multilib qmake-utils user xdg-utils
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+inherit cmake-utils eutils fcaps flag-o-matic git-r3 gnome2-utils ltprune multilib python-r1 qmake-utils user xdg-utils
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="https://www.wireshark.org/"
@@ -21,19 +22,18 @@ IUSE="
 S=${WORKDIR}/${P/_/}
 
 CDEPEND="
-	>=dev-libs/glib-2.14:2
+	>=dev-libs/glib-2.32:2
 	dev-libs/libgcrypt:0
-	netlink? ( dev-libs/libnl:3 )
 	adns? ( >=net-dns/c-ares-1.5 )
 	bcg729? ( media-libs/bcg729 )
+	ciscodump? ( >=net-libs/libssh-0.6 )
 	filecaps? ( sys-libs/libcap )
 	kerberos? ( virtual/krb5 )
-	sshdump? ( >=net-libs/libssh-0.6 )
-	ciscodump? ( >=net-libs/libssh-0.6 )
 	libxml2? ( dev-libs/libxml2 )
 	lua? ( >=dev-lang/lua-5.1:* )
 	lz4? ( app-arch/lz4 )
 	maxminddb? ( dev-libs/libmaxminddb )
+	netlink? ( dev-libs/libnl:3 )
 	nghttp2? ( net-libs/nghttp2 )
 	pcap? ( net-libs/libpcap )
 	qt5? (
@@ -48,6 +48,7 @@ CDEPEND="
 	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 )
 "
@@ -55,9 +56,13 @@ CDEPEND="
 # and broken installs. #455122
 DEPEND="
 	${CDEPEND}
-	dev-lang/perl
-	!<virtual/perl-Pod-Simple-3.170
+	${PYTHON_DEPS}
 	!<perl-core/Pod-Simple-3.170
+	!<virtual/perl-Pod-Simple-3.170
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
 	doc? (
 		app-doc/doxygen
 		dev-ruby/asciidoctor
@@ -65,18 +70,17 @@ DEPEND="
 	qt5? (
 		dev-qt/linguist-tools:5
 	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
 "
 RDEPEND="
 	${CDEPEND}
 	qt5? ( virtual/freedesktop-icon-theme )
 	selinux? ( sec-policy/selinux-wireshark )
 "
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.4-androiddump.patch
 	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+	"${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch
 	"${FILESDIR}"/${PN}-99999999-androiddump-wsutil.patch
 	"${FILESDIR}"/${PN}-99999999-qtsvg.patch
 	"${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch
@@ -107,6 +111,8 @@ src_configure() {
 		append-cxxflags -fPIC -DPIC
 	fi
 
+	python_setup 'python3*'
+
 	mycmakeargs+=(
 		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
 		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
@@ -161,31 +167,24 @@ src_install() {
 	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
 
 	# install headers
-	local wsheader
-	for wsheader in \
-		epan/*.h \
-		epan/crypt/*.h \
-		epan/dfilter/*.h \
-		epan/dissectors/*.h \
-		epan/ftypes/*.h \
-		epan/wmem/*.h \
-		wiretap/*.h \
-		ws_diag_control.h \
-		ws_symbol_export.h \
-		wsutil/*.h
-	do
-		echo "Installing ${wsheader}"
-		insinto /usr/include/wireshark/$( dirname ${wsheader} )
-		doins ${wsheader}
-	done
-
-	for wsheader in \
-		../${P}_build/config.h \
-		../${P}_build/version.h
+	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
-		echo "Installing ${wsheader}"
-		insinto /usr/include/wireshark
-		doins ${wsheader}
+		insinto /usr/include/wireshark/${dir}
+		doins ${dir}/*.h
 	done
 
 	#with the above this really shouldn't be needed, but things may be looking
@@ -215,6 +214,7 @@ pkg_postinst() {
 
 	# 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 \
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 8923c233f64b..68cec601e7b8 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -8,14 +8,15 @@ AUX 2.2/zabbix_agentd.conf 7009 BLAKE2B 868da133c2d0902565eb5b11691e6f0dfbf60060
 AUX 2.2/zabbix_proxy.conf 11353 BLAKE2B 5eb5485a9b547b9a9c97f176f8b88cd72222f8075a9b19b664eb47bf115871a83580879e20557fb9eb8e9c3cc8f53be1d5b0b7474f02e27460c8fbaa0b5dd6e3 SHA512 35e278970a8ca2d1c2ba763d6a57eec4d05586c3eec9c2aa80c67d1eff1b78354dcf823161f03b06ade4c3f9616016a2fc653ea2686e7e0ea4ca00e1bab5e29b
 AUX 2.2/zabbix_server.conf 12145 BLAKE2B 817dda949adbc213b50720e4878d8302fbfa42a98164ec957dfc283270c21f219ad7a70fee72caf854a313a5281da138a8f545e9f42b6241b2e192e9c11f120a SHA512 d53801446011d36ede4821207dd507b50d3b8ebc29d54f9a4d9bfc2814746c73b7fc43156a940c3bd154776cb1b358853727e931eff68a9d1fcd9549c10c6e77
 AUX 3.0/conf.d/zabbix-jmx-proxy 432 BLAKE2B 188737819d39b9e8ec8913237ff048a68ef19f2ec8849bab6c62bea612ac927d00a6c7042ba87261297ff580ef9976618d6acbd24c7fda8f6eb26b2b3dc891bb SHA512 0d68b9681528256131e35b5115053242f8558f5ad06254e61a16ab14f6530048551f0b777fa81d4afe07cc6282c31a6204fd0ee2e56e0e792ed3252222212250
-AUX 3.0/init.d/zabbix-agentd 607 BLAKE2B fbb04b0833956453d29ce228442f2e559fa520ff4ac3ee48165e7ca1b2fd6314864af45f068083cd94afeec17d768bc4c033eff89d94417e42c3f211a333036b SHA512 915594ed8a9a41460e02045292a7235ee70676bacdf3fff721d189c5c39a8937758c2e7c7faa155abc6730bace44a3fbcc41188e4cfdf42796d3feee686daa50
+AUX 3.0/init.d/zabbix-agentd 604 BLAKE2B 3839408133cb02b531ddd948e988bc89a9dfe245d1949726e4b1748060e1ac896a0fb70229623f452a65423e6e6fac9a8db39fb4f3abd78988b0f139512dbdf9 SHA512 ccbb2484fc6f2228d05b38a66cf01b9eaa99f8baf0facc71eda223a9bb8cdcd7c2f5e17a09a5056bbdd8c6d7d0f67a9827ff060ed9c5f3fcaeb61b365decb414
 AUX 3.0/init.d/zabbix-jmx-proxy 849 BLAKE2B 14a312911a11d765210f3bd86d38c8ce3a2f230c821a03d2dd3b2a2aaf05a86cf64a59ea283ad0f11b62fe17a81936cef03463e5cee6535f1a51558b7bad790a SHA512 79a1966405546899b2e6eb4cb53f0ea1ec70575cbf97ff0f9de16d662c5750f8bf276bf8eadaf00cb69ffa078b79e9144eb9824eec6a23df6b2cd315b79b05d8
-AUX 3.0/init.d/zabbix-proxy 585 BLAKE2B 329fbf2eb06331ae698a8b1cd310b945b15c28e1d5a33a80a1e3fe6e107e68d3ba8ca8c2ad685f0cb334dfcd279a20e9a17cedea059e42e6f6fbfbe2516098df SHA512 c70439aa7de8209d1bdd791109c855ceeda3c4de7538f5aab0274f8e3fd5248eae99579293afb4f313148ae8ce0423cecfc338b4da6cb2ea412ed59ddebfc269
-AUX 3.0/init.d/zabbix-server 596 BLAKE2B 1e2a23905cd76bad5785e5b5b2f75378093998a1a30f47db50e14f60ab84ba711c46a8eeca338dc3e9762fe9c6471f393ae2466d5e7c48d12a2e55b7208913d8 SHA512 41109ac7c23fd6be5340923eb82bd724c98390667e86cb71ea02ea8faeaec65c0168aacda462f95936c5d49704b13751cea6bc3d90213db3a3d6bbc42b821fcb
+AUX 3.0/init.d/zabbix-proxy 582 BLAKE2B 69a85a1e93bd4f1759d72252ad7b9de62bbdd2b3fc0876021db420ceb9db89b09e5d249e49f0c65fcbfd77900f3008032c3b3aaf158766ec3fdfc3d8ec31de9e SHA512 9c0b81fedefe6af643800dff3e9955b19ffda3b2266b6ea85705f698d1578e3f550c3776c4343e5867a7c07124a99f1cbba22a549d2e77473e8c0d7c2ae7faed
+AUX 3.0/init.d/zabbix-server 593 BLAKE2B aada741274ecf83a5b0487ee84ad2cff0a111c2a220981f71c01b441be6d78b5a4277ee90bcf6a624c514b67b8e870786c0646a740982af2dfba008925323634 SHA512 53336b569563f1b24066bfaddb2d5da71dbdb153b7450ac4866ed800b426b753e38fe7400ae1ac6b75560c6c1f2913a6a0b3808dad89c4bd73457894d50b682d
 AUX 3.0/zabbix_agent.conf 2138 BLAKE2B b9caab95e3b796de7a3c34a0b485f93d338c854d548ec07dda09372f0e068d9866d8bf6aad63ce39c2ab3c260e05ba26c9f766d47281b6fd083f8a4d7d91e556 SHA512 7cfd6c1b1ec29b72a8d82f8d026cce2c6f56cd4c49d0a9f987193f812032dc26c814bd30f7ff115950dba1a8319d4e1bceebbdcc87f221e0fc34feb8c0264e56
 AUX 3.0/zabbix_agentd.conf 10299 BLAKE2B 23ce2d3dd0b3a033ca98127ff62e78af043f8a75750d9956121a6ab6b2d925ef9cf1062a84425ba599add9e05ec9e8db76e80a84c7b94919377e1b9ac53a1994 SHA512 ed2e8fca996b5227616a01a2479ca5910833e67d4c30b99b2f70a1618d0ec6f44b5a9d68de81131e1d84cd93a6e39ddf1ecb79beb7cb853232cb9ea0b5f6a3d9
 AUX 3.0/zabbix_proxy.conf 15824 BLAKE2B 9055f6cd56407a90dd1dff80b2d08686d285f9b9111d8eaa37f4d25604ba8d27a3e1cde35b7b9f57df2993e9c4b1c8e9428cf61939bc9be74a1781688c0d57e9 SHA512 7f06f7e5514cc30d8f477a522fb37d4ff70307a78c9c748bccc6b352031f85947563a3f965986a9549a6a868bdac9c40d2596ea2e91affe507e0387443b1aab7
 AUX 3.0/zabbix_server.conf 14822 BLAKE2B 055a45ccd7199a2adbaf0a1ffe200b73b0aedd8eb72e273d9fa0ef26068e201177aec47bc4c40d43b6da548751370c8d3a216c1c6dd1eacb9fc96f980fb13630 SHA512 755b8b80d8e10620f8d4d19fb22f3b99633a4904d134665aed982da9a43b2666b622753f7990d27d90d9645fa391882e46c8e37540a107852514d2966b0ce5e2
+AUX 4.0/patches/zbx401-modulepathfix.patch 330 BLAKE2B 99b3f1082e220ff842e4c4c86e8fcf57666443dd1e124412f167548ab886352077e1f0548e49cf77f28a51d20cc37dc980448eb87c9e7814ac73dcbfe43388e0 SHA512 75330dddde2f47553ac6a6f71d6f2383ab34c0d64ac5dbe45dd31707d8797d1400215d698072df3a0f0eaf862f00509791a6a0eaa43a0f686657d885c03465b5
 AUX zabbix-agentd.service 254 BLAKE2B 05e1811530fe9df3212c5700f1865c6f888de4e6f34630ebcd704283ed2d87eb12a8302213cd0c88a7c10c64ec2884f0e54a4b1568eb619d4bd4d4cabdaa5aaf SHA512 f740ef1f6f698eab0ebe894ba726b7a4b35379974c3f5dda26c43c6360f0b8f86f2846c085befe485ced6345fd39e67fe221ce9f08955896e4ccb5561e124c01
 AUX zabbix-agentd.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5cebf2df9bf3d15713b16c6a44b165a3f68fd36a9119163144a2761457d16ce318bd094ed76ae6040c8b09df SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df
 AUX zabbix-proxy.service 244 BLAKE2B ff0407fb1818ed776b2d2f13c19a32f81755bde096e4dbfd358b207ba5290106ed40093770a719d386e5d37bf8bae45fd538b777380b80493b8241ff3cd7e12a SHA512 450bc0ccd110fb012c31e43fc1dd92604255f7577dabce49e67b36f80ef73a1ddfd967e9ca7ccd37dc13e5ac50e0c45bf924999f4e3c7b13ddd284f89f076bad
@@ -35,7 +36,9 @@ DIST zabbix-3.4.11.tar.gz 17517171 BLAKE2B 72f7d1cad3e8cb7972cb9c3698d35f70c45de
 DIST zabbix-3.4.12.tar.gz 17509251 BLAKE2B 158c7b3061059cc54a5988296404ed6670ca872fa8fa55f8de9708871ee03f163d0365420e23ef5df89a0a85e2f23d607952cf4fc02c974037555534ca164f08 SHA512 6707ff5a15d2c139775b4b5de32ceb4982c90aa4023af310ab9cb849895387984d32f59b7dc9fbaff8f317a630238437e4651ab8272b4535fb5fc3d88750e3ef
 DIST zabbix-3.4.13.tar.gz 17507365 BLAKE2B a5d1fa1a48df2ad66b844c2c85038a088ea5f7e3e67c2c3ab5f5d1ad695b3a31664d317e6a1cbf64d1f6a211304f50e5c38f5d973d4607f2caa202e1184420cf SHA512 4edcf6d9df0f100c639efa6bc18e67ed59819e719a2226593fd81212d4c2e46a19cb50501cca005246b4c01c4082a18e21c9049a99ac9df263180a3c24fa52f0
 DIST zabbix-3.4.14.tar.gz 17476022 BLAKE2B 9fccdf69bb74379fccfe044d68da8ce458e04c4686ae70a2fed5523309196b13fb022daa00d47ae9eb97a0774942efd766858dfe94890e20f38808ef2a3e3d15 SHA512 597ae107c16578ec2b1a364f2b61a7a7423a1cf39d3b04289e2f91dc0f931e796b566cbd451b14e026c35302120b647d6d574952a453189b066fb06081f9bb83
-DIST zabbix-4.0.1.tar.gz 18005197 BLAKE2B 3da109715f2061a0104f471f9717947510da8d7a3215fe219d5870bbd8bb1cd769d586c04da3e0aa35a114565bd94911e3c4e62eb66de39af754911a9839d2e3 SHA512 431cb75c62c64e0907cccad6633fe07a66fbaaf8595ca33add6de98a3f79832dd87c23ddaffada796a67055cbdef6d2e5d9c6427498518080205d5ddcd5fbdca
+DIST zabbix-3.4.15.tar.gz 17489570 BLAKE2B 8b820e29334fa7814ab54baef75374955340cb907802722a4f91496a35c7a26fc1c37178c264f606f8a4a95cea350e493763e55f44033eb2aa97ec889664908a SHA512 d210c6576a6c5d67a1f58bb51436c815a191a2ea62f6929784fcac6e0da09febdbb42c11dfb791b6a6d5897dbdda02e10bf56f9162b7f9fb34a57c34b8b1c62f
+DIST zabbix-4.0.2.tar.gz 18018925 BLAKE2B 8e532bad4d99817a2456d34b3b0b67424b81cd907b2b54329d263194b03ba679c265d78be347f3619ca34b1f4acc8862059c068b3d6b06086913f80f3065eff2 SHA512 40b8dd0a4ca9fd7214c7afab57517437097eaf49c943f8827fa637bffb7cc45e77568f002e18cf3fa61a50d5d24fe26520109ad1c6f0424b51325453c9fd0c76
+DIST zabbix-4.0.3.tar.gz 18019170 BLAKE2B 0b36ece98ec68ce48c7f38c167c81c4622e454f5626396fdea67092506bcea120c8cc8fd408e2dd4671db44a4c5c0760aa5aba78204d4ad7d124f7d3e62faf35 SHA512 ee8feec85a01c7617d3420529afa59550982c3c51173f8de484a8833099d33cccb84fa4e82f7199bc0ed8af687eb206ae50e4853b824bfbe784f67964cc15e37
 EBUILD zabbix-2.2.16.ebuild 9436 BLAKE2B 3d7e32e772074500827d0bd469e280f77a4f7319ada11d1556bfa3148d0a25e6b00b84d604ac0cca436d375cabfe9cb145c5e51902c8293668135396d1dfc160 SHA512 c244b2dcff1fc7a1e7dc82c254eef974a4153f3f4bdf1b202d50e3006de3e0237d4dcc587ee66ffcbc16bb39ee4ad29a4dfe283332a3593aba2585f5c970d563
 EBUILD zabbix-2.2.21.ebuild 9438 BLAKE2B 2032d57e9e5dec45250fba571414aa22b896ecd3f13d42d04b86f0392f153e2cfdc9097cac3b983a331dabd03bcde7b74685139879114bd361a15449bd850123 SHA512 dcda14cad8ea47a09853f5768fb9f538a8150a0fc1da33350ab7d77e161fa85b3719dfcac9515b461815d7c710da7b2ca5ff24db7b7a05a26edeceb00931944d
 EBUILD zabbix-2.2.23.ebuild 9438 BLAKE2B 2032d57e9e5dec45250fba571414aa22b896ecd3f13d42d04b86f0392f153e2cfdc9097cac3b983a331dabd03bcde7b74685139879114bd361a15449bd850123 SHA512 dcda14cad8ea47a09853f5768fb9f538a8150a0fc1da33350ab7d77e161fa85b3719dfcac9515b461815d7c710da7b2ca5ff24db7b7a05a26edeceb00931944d
@@ -49,5 +52,7 @@ EBUILD zabbix-3.4.11.ebuild 9256 BLAKE2B ce8500fafcebf61f22020f10b23482eadbb1dbc
 EBUILD zabbix-3.4.12.ebuild 9256 BLAKE2B ce8500fafcebf61f22020f10b23482eadbb1dbc1fc1c42ac9d2c05e429a7ead81ab7def5eeb3521283d62f2f8b947705eca72693082c63c6ed99beeacb14b95b SHA512 9c2ce3518bbdc83215eb191ea097a7233f9032b51d43be4152c630c4c753bfe3f8b827d777c6336f24bd9ec816f02d38d98e01038c179c05de9eb9e8f7889980
 EBUILD zabbix-3.4.13.ebuild 9256 BLAKE2B ce8500fafcebf61f22020f10b23482eadbb1dbc1fc1c42ac9d2c05e429a7ead81ab7def5eeb3521283d62f2f8b947705eca72693082c63c6ed99beeacb14b95b SHA512 9c2ce3518bbdc83215eb191ea097a7233f9032b51d43be4152c630c4c753bfe3f8b827d777c6336f24bd9ec816f02d38d98e01038c179c05de9eb9e8f7889980
 EBUILD zabbix-3.4.14.ebuild 9253 BLAKE2B f381475686894409266e9c642872a728306a89ea472b337709ca45683be504e9ae2822f9d105c256630113f6c874595d130204ca512b6ecd93126fb4926447ef SHA512 d4929f2687c5c0a58ceb7a8a98fed706a62a5a717ba7892d85058b7e1e827095245b022a523daf0d3f53727f42b4ff83c693c1a2195eb3656d589bede632db4d
-EBUILD zabbix-4.0.1.ebuild 9327 BLAKE2B cc59b4eb66a4cf8f24ed590f4c312814fdc9f724714c2cf83079ffd5736a6b2f56eed4aefd49fb70a9f249f20b636f1c6aa8966428af81405cbd219146edf176 SHA512 b150906cbaaea7062ff6a3e375cbacb72d78cb520ed4d0b6da17957d6eee312ba20f16ca1f8b2ccdd96b43b601859be8fdb71b15f22f08df596772da00dbb8af
+EBUILD zabbix-3.4.15.ebuild 9253 BLAKE2B f381475686894409266e9c642872a728306a89ea472b337709ca45683be504e9ae2822f9d105c256630113f6c874595d130204ca512b6ecd93126fb4926447ef SHA512 d4929f2687c5c0a58ceb7a8a98fed706a62a5a717ba7892d85058b7e1e827095245b022a523daf0d3f53727f42b4ff83c693c1a2195eb3656d589bede632db4d
+EBUILD zabbix-4.0.2.ebuild 9396 BLAKE2B 12297f3d67b753be1e8986439c2e6214076a415a7071b7b94804235b2cb40cf4500db1ebf37d0116368d157f5d20a5b0eb61051368fb2b37971d7e1477e0c1b8 SHA512 e6a8aa0df4d4b5a8feb8b00a74fa54704e115e033ed22c886dd042b775923865193bbd819c9c0aa856cbac274fdc8184e30a21c9636584e3d36777dad3f72b59
+EBUILD zabbix-4.0.3.ebuild 9396 BLAKE2B 12297f3d67b753be1e8986439c2e6214076a415a7071b7b94804235b2cb40cf4500db1ebf37d0116368d157f5d20a5b0eb61051368fb2b37971d7e1477e0c1b8 SHA512 e6a8aa0df4d4b5a8feb8b00a74fa54704e115e033ed22c886dd042b775923865193bbd819c9c0aa856cbac274fdc8184e30a21c9636584e3d36777dad3f72b59
 MISC metadata.xml 1402 BLAKE2B 02819796719872a78ba4f7f534344bcde607fd95d10ae0087d62b65490289946f81a70b6ae5341ed6579f4855e998fc46bcff6cc463aa7feb4e768736509128a SHA512 8d3ad204e8cfb4d2aa76f0af90c77d7b6e4cc13da54772d95fe43d68bf85eb96e9d96bc2b11b08421e4684b03ad53042a4f4c0a44817f0e4ea804b81996cda5a
diff --git a/net-analyzer/zabbix/files/3.0/init.d/zabbix-agentd b/net-analyzer/zabbix/files/3.0/init.d/zabbix-agentd
index 2e5024ed2de8..d803d4450cac 100644..100755
--- a/net-analyzer/zabbix/files/3.0/init.d/zabbix-agentd
+++ b/net-analyzer/zabbix/files/3.0/init.d/zabbix-agentd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 pid_file="/run/zabbix/zabbix_agentd.pid"
diff --git a/net-analyzer/zabbix/files/3.0/init.d/zabbix-proxy b/net-analyzer/zabbix/files/3.0/init.d/zabbix-proxy
index 81dc78f08e3f..6aa1793435c8 100644..100755
--- a/net-analyzer/zabbix/files/3.0/init.d/zabbix-proxy
+++ b/net-analyzer/zabbix/files/3.0/init.d/zabbix-proxy
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 pid_file="/run/zabbix/zabbix_proxy.pid"
diff --git a/net-analyzer/zabbix/files/3.0/init.d/zabbix-server b/net-analyzer/zabbix/files/3.0/init.d/zabbix-server
index a57a3100dd95..109c6545d456 100644..100755
--- a/net-analyzer/zabbix/files/3.0/init.d/zabbix-server
+++ b/net-analyzer/zabbix/files/3.0/init.d/zabbix-server
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 pid_file="/run/zabbix/zabbix_server.pid"
diff --git a/net-analyzer/zabbix/files/4.0/patches/zbx401-modulepathfix.patch b/net-analyzer/zabbix/files/4.0/patches/zbx401-modulepathfix.patch
new file mode 100644
index 000000000000..c0d1650fb85c
--- /dev/null
+++ b/net-analyzer/zabbix/files/4.0/patches/zbx401-modulepathfix.patch
@@ -0,0 +1,11 @@
+--- zabbix-4.0.1/configure	2018-10-29 10:36:05.000000000 -0700
++++ zfx/configure	2018-11-07 16:59:28.015968345 -0800
+@@ -12510,7 +12510,7 @@
+ CURL_SSL_CERT_LOCATION="${datadir}/zabbix/ssl/certs"
+ CURL_SSL_KEY_LOCATION="${datadir}/zabbix/ssl/keys"
+ 
+-LOAD_MODULE_PATH="${libdir}/modules"
++LOAD_MODULE_PATH="${libdir}/zabbix"
+ 
+ 
+ 
diff --git a/net-analyzer/zabbix/zabbix-3.4.15.ebuild b/net-analyzer/zabbix/zabbix-3.4.15.ebuild
new file mode 100644
index 000000000000..dd57544e3c45
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-3.4.15.ebuild
@@ -0,0 +1,329 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )
+	ssl? ( dev-libs/openssl:=[-bindist] )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping[suid] )
+	server? ( net-analyzer/fping[suid]
+		app-admin/webapp-config
+		dev-libs/libevent )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( dev-db/postgresql:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		$(use_with ssl openssl) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_server.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
+		dosbin src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-0.9.27.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-0.9.27.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.6.1.jar
+		fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+		doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
+		doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-4.0.1.ebuild b/net-analyzer/zabbix/zabbix-4.0.2.ebuild
index f936b89f0ddc..0ed8678d8d94 100644
--- a/net-analyzer/zabbix/zabbix-4.0.1.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.2.ebuild
@@ -118,7 +118,8 @@ java_prepare() {
 }
 
 src_prepare() {
-	default
+	eapply -p1 "${FILESDIR}/4.0/patches/zbx401-modulepathfix.patch"
+	eapply_user
 }
 
 src_configure() {
diff --git a/net-analyzer/zabbix/zabbix-4.0.3.ebuild b/net-analyzer/zabbix/zabbix-4.0.3.ebuild
new file mode 100644
index 000000000000..0ed8678d8d94
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-4.0.3.ebuild
@@ -0,0 +1,333 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS=""
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( >=dev-db/postgresql-8.1:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )
+	server? ( sys-libs/zlib )
+	proxy?  ( sys-libs/zlib )
+	ssl? ( dev-libs/openssl:=[-bindist] )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping[suid] )
+	server? ( net-analyzer/fping[suid]
+		app-admin/webapp-config
+		dev-libs/libpcre
+		dev-libs/libevent )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.4.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( >=dev-db/postgresql-8.1:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	eapply -p1 "${FILESDIR}/4.0/patches/zbx401-modulepathfix.patch"
+	eapply_user
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		$(use_with ssl openssl) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_server.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
+		dosbin src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-0.9.27.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-0.9.27.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.6.1.jar
+		fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+		doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
+		doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
commit	de49812990871e1705b64051c35161d5e6400269 (patch)
tree	5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /net-analyzer
parent	536c3711867ec947c1738f2c4b96f22e4863322d (diff)