gentoo resync : 30.06.2018

41 files changed, 522 insertions, 408 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index c338aaf09786..46df25530c52 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/carl/Manifest b/net-analyzer/carl/Manifest
index 3ed08a9af187..0770098449d3 100644
--- a/net-analyzer/carl/Manifest
+++ b/net-analyzer/carl/Manifest
@@ -1,3 +1,3 @@
 DIST carl-0.9.tar.gz 11096 BLAKE2B 46298873f8fff62a965a7ec7a657522dd90d1a298814f537bb5b32582ea63d0bcb1d4988cd31e6918f16514c65dd3c6517e9079c3c78f6cb0a4bc6d8ece1614a SHA512 9876e30d171bf00c4e53c6e90c98181ac25aeda004bdb8a03060c45a99c55fa087062076ff3964a222d2981ed682ae7b8f4cbade13c69154198200d35e1a577e
-EBUILD carl-0.9-r2.ebuild 414 BLAKE2B bc1f7a3ebe656019096f2e2930ca75cca24d31c17741913ca24a3b5516357b9ed38fd2859e827908dc2ad2f51da4288244e0f55d77fd5890399be14dba588efe SHA512 4e294581c340916a0ff568dc478f30a9e8258464fe7c3eec41296d4ce7006d6ec8a1a7e218ce0a2f8bc904b42d01044acc7c041a79a6bc7c7a9afaaf5caf051b
+EBUILD carl-0.9-r2.ebuild 418 BLAKE2B bbc91d45cdd2fa561a19cdfe9efb8470d73feb34f7a9dccf3bdca539f0bc93cb739030960dba8c2c53f78a5ead05fcbb547961584fcb7aa18c371cb3011474b8 SHA512 186dc220715268d25e6e80fb1eb84bed663cdba75c33e13c1e61fa00d331f71521b12fa65dc8a6af51a0bfab493dd0f15cadca9368bf0133f8fe9ad3100c449b
 MISC metadata.xml 356 BLAKE2B bcdfa5dbbe63451ed8f27bfdcc926c60452ebf67fdcf486c487bb284b95c06f4baae460e7a6b607b698110175f2a21ad1fc702b3807ef53e2c6c40437bbdfb1b SHA512 e61b1bac117a325c4e96c7d8c594bd0de46379e573e8b89df72dfca572922807af29b2741c86be602d01856bed58bd369e72d65f0fef508d54001c00578d8637
diff --git a/net-analyzer/carl/carl-0.9-r2.ebuild b/net-analyzer/carl/carl-0.9-r2.ebuild
index f2118fd8ffd0..715bd16d4cf9 100644
--- a/net-analyzer/carl/carl-0.9-r2.ebuild
+++ b/net-analyzer/carl/carl-0.9-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy pypy3)
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy pypy3)
 
 inherit distutils-r1
 
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index 0f22fc48c14b..72a9a15e4ae3 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -2,7 +2,7 @@ DIST fail2ban-0.10.2.tar.gz 474675 BLAKE2B 569599eec3c7b786933af332507ca148f49d3
 DIST fail2ban-0.10.3.1.tar.gz 485826 BLAKE2B 79ca86a601bd79ba3729d4c9b00f20a0717df8c7ceb20183099e11f84cceade274173be90d0b4b000d37a1b9d242e14106c9e7e40e372e450d69bca003fff6fb SHA512 ed3646ef2113fe10d9130c239818087b228ac9708411e26acc412beae022e3f9ff8cea32d824bd491117882fb8f184dcb88bda295bd31e865ac8310c7e27fc7a
 DIST fail2ban-0.9.6.tar.gz 352145 BLAKE2B a529a7a1c78f29f457abc26215da015f7624f6d777571e96725775557725b6cbbfda5068e77520f1b3c20efcff07c11f210c5cca3ed47cf86c6f5e87c503052f SHA512 c09778d39741dc38d1073495a9f491012717d5ed04d28722f2ae6755104bdcc472baf06d33f500fed592b04c05277ba5cf74e527f1c0ed751108f4f1be22fa7e
 EBUILD fail2ban-0.10.2.ebuild 3349 BLAKE2B 030c91982ed07d229c72605bdb80648596a686416d6e695cd8057092bf9a4167a39b23b38d234c3ed91879f897c899d64a3f1b6fa7fc1c9828641b8f8e8a2e8a SHA512 d818e7e00258bccd14540ebedd427f3e05dc7b5feef3138a80123425726388d82e21b0f49ce71fd5e15a486a4042e4533e28e0a947941a985c78ae98939e7584
-EBUILD fail2ban-0.10.3.1.ebuild 3349 BLAKE2B 030c91982ed07d229c72605bdb80648596a686416d6e695cd8057092bf9a4167a39b23b38d234c3ed91879f897c899d64a3f1b6fa7fc1c9828641b8f8e8a2e8a SHA512 d818e7e00258bccd14540ebedd427f3e05dc7b5feef3138a80123425726388d82e21b0f49ce71fd5e15a486a4042e4533e28e0a947941a985c78ae98939e7584
+EBUILD fail2ban-0.10.3.1.ebuild 3344 BLAKE2B b2851fe55c59ce815ec89b137fa656279e5e984f3cd6a82e3e395439252b43e5f33cc9bb66491f0b2cfed4dfe118c9b97b123d3cfd49280acb936e51aa8d14d3 SHA512 01dcac4c1ec75a0c82db304fdccd6d71326fce56fb54a5b92a69a00f31420b25c2e7f4181cd5877a71ae365bd4c81cb761278d344e430b2d9a34cc2dfd8c5c81
 EBUILD fail2ban-0.9.6.ebuild 3118 BLAKE2B 421153aa5ee52702e6cb79dd780ed3706b22c4ee7497c4da505cc1a2c7aee27c80ad737b427e4de3abcaea129add9b9b70e008336597ca2e57bdc6d08dcda790 SHA512 e10fe1a544c0ea50eade24a3399cc2e4f27a0cbd4e4455a2cbc48cd1def13793474a24f4eefaefcb4ddc5c3e3773821c6149001c83ca953db3be1dcfb41d30b0
 EBUILD fail2ban-99999999.ebuild 3190 BLAKE2B dac84d04dc01c20b5af2a34c07be78ce7db25c79d00a5cfc7e6c58b4077e884b71e8fdb83b34e9abe7326c68836b3963d6ebd373bb618e74db4f13cb7464e086 SHA512 8b2a59c16a2a9bc712c7d905a30df88d72ebf47e5f89e227bd1371ae35aa7d44c6056c1aef7c9952ae166b0bab806e8a21ee584eff36652df43d0cc668f237e5
 MISC metadata.xml 372 BLAKE2B 7fca866187d9a128e6fb6787a4099d7a6442e0e51e558786773b91c3e2f06e67167d76f9bc96be0fe1baa1c44fc3f0e9e2105a327a10cb2720b3e3f9e4303a66 SHA512 4d5710e2fb4a7c353ca6bd3203bceef57d4d004367993dc1044800ee8713a3f4697fe8ba3472a73ecd015503656dfb7cd68d674c99188ce5702769cfeaf06b25
diff --git a/net-analyzer/fail2ban/fail2ban-0.10.3.1.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.3.1.ebuild
index 1efe5233391c..1ccf82b68cd5 100644
--- a/net-analyzer/fail2ban/fail2ban-0.10.3.1.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.10.3.1.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/flent/Manifest b/net-analyzer/flent/Manifest
index 565bba0a81b6..ed3451fd56f1 100644
--- a/net-analyzer/flent/Manifest
+++ b/net-analyzer/flent/Manifest
@@ -1,3 +1,3 @@
 DIST flent-1.0.1.tar.gz 2285619 BLAKE2B d5ab68144c8520e8077eddd529beb248654d59e05e6b5c90823bae61a86b0dffae959c2089be03b96731e7575eabcfcae2c7b738e9a8a77520a615c48801549a SHA512 868b83a52805cfdb0dc49379aea25e07135a949cea0e6c2388b026099723c20aa7b0146e19110786e763c7f22e1663c42a8bc21bdae2199d00ac85438a3fdf74
-EBUILD flent-1.0.1-r1.ebuild 626 BLAKE2B 94df6ebc79dd511ed928c96fe8f0aca8788cd80caf6151561d280850d9ac4c802585279f45345b01f457ca88bb2ca1c9192c55d7aecda2d916f24d8eba7f0afc SHA512 a1af9b11fd460ff7868e960a5b68a1e20b9e091164c4a17cc0f3872ac4b7353d012a903728b3d289f931d5668f0f533912c48faabc7ef8e1ca90d8ac72e2a72a
+EBUILD flent-1.0.1-r1.ebuild 630 BLAKE2B c2b2fa9d4a0de2966529e0f3150eb9b0ccbd3eb64ba0e6c94ed9ebbf5fb65bd62a9df8b98d814a51089c47a734f71b805823b83954684d9e3568cd4991376ca4 SHA512 22cf85bd02a2ab9c441ab67ba90b556af8c21fc60f4a925dc2fb6a0939350d25cb09c8f51ea21ded8fe7d403edd30b002c07cec3725ee6939b9ff2c50f2cf4b8
 MISC metadata.xml 391 BLAKE2B 85925178db6e1ae966b020139760580a899541dba0a5160dd0a40d99a13838ff9d4884e70ae5f594f34a311ecc7a3eae00cf9d6027f538b58ef6aca3f2e6b43d SHA512 f659fc94acbe2d182b842fe2ef9a5a6f2cdbf43fc229e200586ee3a3d0a89f49eeddede26efc370b2a7710a739b50d8d83f219248628581da795b9e80a25baf7
diff --git a/net-analyzer/flent/flent-1.0.1-r1.ebuild b/net-analyzer/flent/flent-1.0.1-r1.ebuild
index d90d41ace9b5..d93d6849eaf8 100644
--- a/net-analyzer/flent/flent-1.0.1-r1.ebuild
+++ b/net-analyzer/flent/flent-1.0.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python{3_4,3_5} )
+PYTHON_COMPAT=( python2_7 python{3_4,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/net-analyzer/gnu-netcat/Manifest b/net-analyzer/gnu-netcat/Manifest
index ab25acc85624..97a47684e470 100644
--- a/net-analyzer/gnu-netcat/Manifest
+++ b/net-analyzer/gnu-netcat/Manifest
@@ -3,4 +3,5 @@ AUX gnu-netcat-close.patch 342 BLAKE2B 24fd65ae42672c292c832fc1b5ca4d9ed64263f3f
 AUX gnu-netcat-flagcount.patch 479 BLAKE2B bf3838a82c8df361cb8f596d103bff0f52345d5ab2816f1de056acab71089585e0bca1b1c75793d4b67390246038fc502ed2b3c99c3c667361f6a325ef9df228 SHA512 cc8cefad31422eec8fc549e02c3cac5a725f6d0232d2a6e4383324530f5bdb771ec5e9221f2455b2f4b3d636eeda73a346a9cfb74856977b10136685420199d2
 DIST netcat-0.7.1.tar.bz2 325687 BLAKE2B a846fafcd006cc284f982fe66a3de5154ef1d74d20926344c54066f9b5e86f7bef06eb99313d5ec7f9f09bdb9b12ca82421b945bc6d3b8c6bb5f843cd6d31c2c SHA512 283c02f849c3bb62615a5ccb7796192804dafcecb34f3c6b553cbc12c715654963b81e253762923c6069be9768b93dde576a392b89b167912c323354f1376e83
 EBUILD gnu-netcat-0.7.1-r3.ebuild 836 BLAKE2B 1c46dbb2af156ea1584eed7dd59838e30ba92adc76cae1242ca3584a8687064db84d19fbc96934504c342f541eb7b323be17df2277b651e9420293e46b942a19 SHA512 c714f489e809d3d6d8084cfee67c181f004915e1b5d6497417fc2d58546d28df3d479ae3f37bbf520c8fc735784ad95843e6719bbbde37a8e2a2bf1d3c7f482b
+EBUILD gnu-netcat-0.7.1-r4.ebuild 819 BLAKE2B 1d00ba629c08d1b9db794148da6ea64e69ae236a6df3df848e843f89e182b91144eb257089faf262e21e129068b514b44ff35a2aa774f7aa2e701dbcac210e91 SHA512 b7b8f7c3ec8b553e31bf0dc247dde27e4802a3956089182826aaba50ee16e33bd3b09ed06d31f902dc427c7a1da34675a7b26d0d8ec1da21637c3a958cd430f6
 MISC metadata.xml 425 BLAKE2B f13edbb0cd292574b75df3cffd4f9786d267eee4525c839ba668947df28cdcfafa5a460decca9a2deeafbdd6956c8c2af416bed862ffcb43b2f980a54c7f2ea1 SHA512 a2cbcf2da6524c0ce77c0961511555cbcc36adea879aeb0aae82e973827b34e2b3d9f6d78317262bd4b0e07726316fd36055024dd36cd228edb384fe27d84a85
diff --git a/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r4.ebuild b/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r4.ebuild
new file mode 100644
index 000000000000..f71fcffaaa0b
--- /dev/null
+++ b/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic
+
+DESCRIPTION="the GNU network swiss army knife"
+HOMEPAGE="http://netcat.sourceforge.net/"
+SRC_URI="mirror://sourceforge/netcat/netcat-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug nls"
+
+PATCHES=(
+		"${FILESDIR}"/${PN}-LC_CTYPE.patch
+		"${FILESDIR}"/${PN}-close.patch
+		"${FILESDIR}"/${PN}-flagcount.patch
+)
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+S=${WORKDIR}/netcat-${PV}
+
+src_configure() {
+	use debug && append-flags -DDEBUG
+	econf $(use_enable nls)
+}
+
+src_install() {
+	default
+	rm "${ED}"usr/bin/nc || die
+}
diff --git a/net-analyzer/graphite-web/Manifest b/net-analyzer/graphite-web/Manifest
index d196f145df8a..83cddef7a949 100644
--- a/net-analyzer/graphite-web/Manifest
+++ b/net-analyzer/graphite-web/Manifest
@@ -1,9 +1,9 @@
 AUX graphite-web-0.9.13-fhs-paths.patch 3183 BLAKE2B 0ef1c5e5c171cd1823a3d52d11d5e4b426f82b26636bd0f250514653f7bc0ddb4da9d698562aabac5711bf3d8a2cf5c8d64c2eb7cd7ad79dc495da6e3339d09e SHA512 18ec1ef401c2e3d1209ed3a2a796dfc94088ea7324ae28c3afddd8c857a83ff00afcb5ef0673b838eedae433893b12b57283c9d4a0e53f90b5063ae4f36abcf2
 AUX graphite-web-0.9.13-system-libs.patch 3379 BLAKE2B 28fbbd23365d67891b6b818a77a07c9eabafd8c519764d2ee6227a07e42a410800f868753f9c46677269a4c9e978bfb6024ae9551d2830742e5d1cb17998c59b SHA512 df4b95dfa6f6a58ba2e8aeb7b3d3e26e5d122718b88e2ec747676fcbb0539190ebc9e7938b3d34a73f0018e121ce297faa50af839f138ce5b21116777fcb7748
-AUX graphite-web-1.1.3-fhs-paths.patch 2360 BLAKE2B 7ca032f15121f2cedd6478bb137517798ad38a08d21cf1f20063241006aea1ae4f2ca96ecc39e039e6157d9d918c2dd0adbdbb54ff4bf561e909a4905f837209 SHA512 fac8caf178ab80785e7d4d55d233f9219cc217cc75f5ac3b303a77a4e91b234010f9f15896c25e0d88b515006fbcc8c0ebad18ad2fcab60def5c07774185ec5f
+AUX graphite-web-1.1.3-fhs-paths.patch 2714 BLAKE2B 3c2e4a73e32626ba28ee1c3f5697e95f52e3cdcb88f137ff1e42581b9daf75521dd1d3d452e1be7157658914a50116b58b35c39551260be54b385bd50c0e1ef0 SHA512 1f3ca2def8e757a2f86acc58636fccda55ae81977d6b435e4cb44eecdbb613b1791eb286ca46b97a832ce80cce3bedd52dd8ba74a9566ce3b71b998b5e6ca438
 DIST graphite-web-0.9.13-share.png 325 BLAKE2B 390d5de23ae8300ca042e9c259fb7f892a4fd69ee8225d171b1f32b4215188fdd7a5c4f8e65fb3eae64cf154044ddb03c4490a8318ef8dc5934f3d5c04aeb6bb SHA512 19dc9139e97a99bf06fded2958bc52bc856fa11d0dc50f57e6c54214373795534cb74883ab5da7a05e2ddb69a2870d3b02dcf2ab0628bdf289f1ffd925e044e2
 DIST graphite-web-0.9.13.tar.gz 2182781 BLAKE2B c4db10fbdfd45efb683862967e743de5d96a6342ade85548c43f3072fbc7f15d32a606979800e1c46ce8c81611121fa91ed873d57a184c92cc3167a7c5ac531e SHA512 5e2cc84ec57e1fa0ecff8c9671d8753655a8ce2c07ce2f446451ceaad7679b0cefe932de45315be360b8f13eb25cd25ef179814f340c2c42b0e7048a3d4f4a96
 DIST graphite-web-1.1.3.tar.gz 1171342 BLAKE2B f18c84d707f93d897553ec05d7b910a3dba97c6068498d1b216f178ea8a1f64baf59bb572b433a56f5e417a2873c018a38a19c3b8c765f667d7c3fbb38b9ed0a SHA512 3f9de216bd55e4e8de7391087e9b876a16e4f137fd60932a6d5855804c3d9868422645177776258e74486b97ec7a853b63a6d89b1de9b325bcb50ad694208436
-EBUILD graphite-web-0.9.13-r3.ebuild 3418 BLAKE2B 7c884d1866210c4be2c884663dedea1ede3b9dc8fd3b0189e7cc07c063292420df118e6b578dbe7be97beb7812c45d5630c37c129ec6ac01df3a60708dfa5fb0 SHA512 6ec67b34b46994ab4e9761bcf72b58ec5f62609353ef1349a26ef2580a9bff16c1737423c9073add748a141002f235a019ee5f6f36d98f8e43f2b7eafa00675a
-EBUILD graphite-web-1.1.3.ebuild 3565 BLAKE2B 0e4b9e66e0aea873e5b024ea12ed3489e74f6e97491d4a76216687fcb84b34a0a6e1e90e099f543e3315f6386f188877043002926e0d5995db36590c8ebf0e87 SHA512 42cc064625b047b4a9c6ce224084759924c3165c3231f0f917eead87f4c067ce3b22bef7841d5045f5b5876306bb1be1a86a02b802fd6e68937f862320698fa7
-MISC metadata.xml 446 BLAKE2B a0d9086db1e991d5ec91bda9c99ba49f6068ffc3c04117dfe974a41ad0ba6d00e0ff15ce931996e3fce3519f873ae8c3ee1be403c0e4e38758e5cd2183ec6e03 SHA512 7a94e8f66bf14b0d74b4825908282db8bf8155d14c21fda79aa3815cc0b0aa70c2ebfbc69e3239d9fd1bec02f072b9423cc54cc4d0d605fa5febb39651b25f3d
+EBUILD graphite-web-0.9.13-r3.ebuild 3410 BLAKE2B 867e9e5acb08071ea9a5e5868a1f02e39f94738b7764653ac91188731048ce35d6e730bdc1c01540c09191b200501fbfe3afdeae8348ddfbfc70fcd17bd9d318 SHA512 7ca08399bfa996c63b2898122b6f60f720a3526ed9355e018346a1da15ffa3111c5912b5f31cca4881a6f725e74b549f376e035525d55e8b2b767671ade72b06
+EBUILD graphite-web-1.1.3-r1.ebuild 2962 BLAKE2B a70de2670532ce0292ae6c5fcfeef6a77702ac5bdbd17cf9fe31d1f04dad6ae67e264ad4083290105e253916634742c00807acae61741cb486a7fb9397ee2302 SHA512 1fc184393bff1f5d9689ff6d82b556516c5591244205f1278df107b1383d401d3a6ae5d8d505f8db72d1c55c902ff189a18d1e5c863fc46acde8f533a7e8e45f
+MISC metadata.xml 592 BLAKE2B 1c284eea68c1db410d55439c14dbf245651157c8f3cb2c77357e50ad8d4426e1c2faf8bd767095f49e9a711e84bbe8b5223aa26529d6dd9cd8dd08c3d8c7c75a SHA512 e9be9344db6989ed9d1d649fff05c4d05c72528097c6d921b5d0d31f9be65d1cfb02071356101f46ffddfa5b7a91785995ad59e15ba0fd78b75d785959051a98
diff --git a/net-analyzer/graphite-web/files/graphite-web-1.1.3-fhs-paths.patch b/net-analyzer/graphite-web/files/graphite-web-1.1.3-fhs-paths.patch
index 39d325984245..aa6ea74ff93f 100644
--- a/net-analyzer/graphite-web/files/graphite-web-1.1.3-fhs-paths.patch
+++ b/net-analyzer/graphite-web/files/graphite-web-1.1.3-fhs-paths.patch
@@ -10,11 +10,12 @@ Install FHS-style paths
  from graphite.wsgi import application
 --- a/setup.py
 +++ b/setup.py
-@@ -59,8 +59,7 @@
+@@ -59,8 +59,8 @@
        ],
        package_data={'graphite' :
          ['templates/*', 'local_settings.py.example']},
 -      scripts=glob('bin/*'),
++      scripts=['bin/graphite-web-build-index'],
 -      data_files=list(webapp_content.items()) + storage_dirs + conf_files + examples,
 +      data_files=list(webapp_content.items()),
        install_requires=['Django>=1.8,<1.11.99', 'django-tagging==0.4.3', 'pytz', 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'],
@@ -36,7 +37,7 @@ Install FHS-style paths
  #INDEX_FILE = '/opt/graphite/storage/index'     # Search index file
 +CONF_DIR = '@GENTOO_PORTAGE_EPREFIX@/etc/graphite-web'
 +STORAGE_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon'
-+STATIC_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web'
++STATIC_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp/content'
 +LOG_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/log/graphite-web'
 +INDEX_FILE = '@GENTOO_PORTAGE_EPREFIX@/var/lib/graphite-web/index'  # Search index file
  
@@ -51,3 +52,12 @@ Install FHS-style paths
  #
  # Data directories using the "Standard" metrics finder (i.e. not Ceres)
  #STANDARD_DIRS = [WHISPER_DIR, RRD_DIR] # Default: set from the above variables
+@@ -244,7 +244,7 @@
+ #
+ #DATABASES = {
+ #    'default': {
+-#        'NAME': '/opt/graphite/storage/graphite.db',
++#        'NAME': '@GENTOO_PORTAGE_EPREFIX@/var/lib/graphite-web/graphite.db',
+ #        'ENGINE': 'django.db.backends.sqlite3',
+ #        'USER': '',
+ #        'PASSWORD': '',
diff --git a/net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild b/net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild
index 437a290d1014..f0fed573df9f 100644
--- a/net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1 python-utils-r1 prefix
 
 DESCRIPTION="Enterprise scalable realtime graphing"
-HOMEPAGE="http://graphite.readthedocs.org/"
+HOMEPAGE="https://graphiteapp.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 	https://raw.githubusercontent.com/graphite-project/graphite-web/522d84fed687bd946878e48d85982d59f7bd1267/webapp/content/img/share.png -> ${P}-share.png"
 
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild
new file mode 100644
index 000000000000..1f67a202f1ff
--- /dev/null
+++ b/net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1 python-utils-r1 prefix
+
+DESCRIPTION="Enterprise scalable realtime graphing"
+HOMEPAGE="https://graphiteapp.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+carbon ldap mysql memcached postgres +sqlite"
+
+DEPEND=""
+RDEPEND="
+	carbon? ( dev-python/carbon[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	memcached? ( dev-python/python-memcached[${PYTHON_USEDEP}] )
+	mysql? (
+		|| (
+			dev-python/mysql-python[${PYTHON_USEDEP}]
+			dev-python/mysqlclient[${PYTHON_USEDEP}]
+		)
+	)
+	postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	>=dev-python/django-1.8[sqlite?,${PYTHON_USEDEP}]
+	<dev-python/django-1.11.99[sqlite?,${PYTHON_USEDEP}]
+	>=dev-python/django-tagging-0.4.3[${PYTHON_USEDEP}]
+	dev-python/cairocffi[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/scandir[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	media-libs/fontconfig
+"
+
+PATCHES=(
+	# Do not install the configuration and data files. We install them
+	# somewhere sensible by hand.
+	"${FILESDIR}"/${PN}-1.1.3-fhs-paths.patch
+)
+
+python_prepare_all() {
+	# Use a less common name
+	mv bin/build-index bin/${PN}-build-index || die
+	# use FHS-style paths
+	export GRAPHITE_NO_PREFIX=yes
+	distutils-r1_python_prepare_all
+	eprefixify \
+		conf/graphite.wsgi.example \
+		webapp/graphite/local_settings.py.example
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	keepdir /var/{lib,log}/${PN}
+	docinto examples
+	docompress -x "/usr/share/doc/${PF}/examples"
+	dodoc \
+		examples/example-graphite-vhost.conf \
+		conf/dashboard.conf.example \
+		conf/graphite.wsgi.example
+}
+
+python_install() {
+	distutils-r1_python_install \
+		--install-data="${EPREFIX}"/usr/share/${PN}
+
+	insinto /etc/${PN}
+	newins webapp/graphite/local_settings.py.example local_settings.py
+	pushd "${D}/$(python_get_sitedir)"/graphite > /dev/null || die
+	ln -s ../../../../../etc/${PN}/local_settings.py local_settings.py || die
+	popd > /dev/null || die
+}
+
+pkg_config() {
+	"${EROOT}"/usr/bin/django-admin.py migrate \
+		--settings=graphite.settings --run-syncdb
+	"${EROOT}"/usr/bin/${PN}-build-index
+}
+
+pkg_postinst() {
+	# Only display this for new installs
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "You need to configure ${PN} to run with a WSGI server of your choice."
+		elog "Don't forget to edit local_settings.py in ${EPREFIX}/etc/${PN}"
+		elog "See https://graphite.readthedocs.org/en/latest/config-local-settings.html"
+		elog "Run emerge --config =${PN}-${PVR} if this is a fresh install."
+		elog ""
+		elog "If you want to update the search index regularily, you should consider running"
+		elog "the '${PN}-build-index' script in a crontab."
+	fi
+}
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.3.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.3.ebuild
deleted file mode 100644
index e8d0e6ccfcbe..000000000000
--- a/net-analyzer/graphite-web/graphite-web-1.1.3.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-
-inherit distutils-r1 python-utils-r1 prefix
-
-DESCRIPTION="Enterprise scalable realtime graphing"
-HOMEPAGE="http://graphite.readthedocs.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+carbon mysql memcached postgres +sqlite"
-#ldap - needs bump of python-ldap to latest
-# ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-
-DEPEND=""
-RDEPEND="
-	carbon? ( dev-python/carbon[${PYTHON_USEDEP}] )
-	mysql? (
-		|| (
-			dev-python/mysql-python[${PYTHON_USEDEP}]
-			dev-python/mysqlclient[${PYTHON_USEDEP}]
-		)
-	)
-	memcached? ( dev-python/python-memcached[${PYTHON_USEDEP}] )
-	postgres? (
-		dev-python/psycopg:2[${PYTHON_USEDEP}]
-	)
-	dev-lang/python[sqlite?]
-	dev-python/cairocffi[${PYTHON_USEDEP}]
-	>=dev-python/django-1.8[sqlite?,${PYTHON_USEDEP}]
-	<dev-python/django-1.11.99[sqlite?,${PYTHON_USEDEP}]
-	>=dev-python/django-tagging-0.4.3[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/scandir[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/txAMQP[${PYTHON_USEDEP}]
-	dev-python/twisted[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	dev-python/whisper[${PYTHON_USEDEP}]
-	media-libs/fontconfig"
-
-PATCHES=(
-	# Do not install the configuration and data files. We install them
-	# somewhere sensible by hand.
-	"${FILESDIR}"/${PN}-1.1.3-fhs-paths.patch
-)
-
-src_prepare() {
-	# use FHS-style paths
-	export GRAPHITE_NO_PREFIX=yes
-	# make sure we don't use bundled stuff
-	rm -Rf webapp/graphite/thirdparty
-	distutils-r1_src_prepare
-	eprefixify \
-		conf/graphite.wsgi.example \
-		webapp/graphite/local_settings.py.example
-}
-
-python_install() {
-	distutils-r1_python_install \
-		--install-data="${EPREFIX}"/usr/share/${PN}
-
-	# make manage.py available from an easier location/name
-	# (missing from tarball)
-	dodir /usr/bin
-	cat > "${ED}"/usr/bin/${PN}-manage <<- EOS
-		#!/usr/bin/env python
-		import os
-		import sys
-
-		if __name__ == "__main__":
-		    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "graphite.settings")
-
-		    from django.core.management import execute_from_command_line
-
-		    execute_from_command_line(sys.argv)
-	EOS
-	#mv "${D}"/$(python_get_sitedir)/graphite/manage.py \
-	#	"${ED}"/usr/bin/${PN}-manage || die
-	chmod 0755 "${ED}"/usr/bin/${PN}-manage || die
-	python_fix_shebang "${ED}"/usr/bin/${PN}-manage
-
-	insinto /etc/${PN}
-	newins webapp/graphite/local_settings.py.example local_settings.py
-	pushd "${D}"/$(python_get_sitedir)/graphite > /dev/null || die
-	ln -s ../../../../../etc/${PN}/local_settings.py local_settings.py
-	popd > /dev/null || die
-
-	insinto /usr/share/doc/${PF}/examples
-	doins \
-		examples/example-graphite-vhost.conf \
-		conf/dashboard.conf.example \
-		conf/graphite.wsgi.example
-}
-
-pkg_config() {
-	"${ROOT}"/usr/bin/${PN}-manage syncdb --noinput
-	local idx=$(grep 'INDEX_FILE =' "${EROOT}"/etc/graphite-web/local_settings.py 2>/dev/null)
-	if [[ -n ${idx} ]] ; then
-		idx=${idx##*=}
-		idx=$(echo ${idx})
-		eval "idx=${idx}"
-		touch "${ROOT}"/"${idx}"/index
-	fi
-}
-
-pkg_postinst() {
-	einfo "You need to configure ${PN} to run with a WSGI server of your choice."
-	einfo "Don't forget to edit local_settings.py in ${EPREFIX}/etc/${PN}"
-	einfo "See http://graphite.readthedocs.org/en/latest/config-local-settings.html"
-	einfo "Run emerge --config =${PN}-${PVR} if this is a fresh install."
-}
diff --git a/net-analyzer/graphite-web/metadata.xml b/net-analyzer/graphite-web/metadata.xml
index 851f07a3b532..d4f9fa582626 100644
--- a/net-analyzer/graphite-web/metadata.xml
+++ b/net-analyzer/graphite-web/metadata.xml
@@ -11,5 +11,7 @@
 	</use>
 	<upstream>
 		<remote-id type="pypi">graphite-web</remote-id>
+		<remote-id type="github">graphite-project/graphite-web</remote-id>
+		<bugs-to>https://github.com/graphite-project/graphite-web/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/nagios-check_openvpn-simple/Manifest b/net-analyzer/nagios-check_openvpn-simple/Manifest
index 4d78be89fb53..a81b9e9301a6 100644
--- a/net-analyzer/nagios-check_openvpn-simple/Manifest
+++ b/net-analyzer/nagios-check_openvpn-simple/Manifest
@@ -1,3 +1,3 @@
 DIST check_openvpn-simple-0.0.1.tar.gz 13597 BLAKE2B 8cf1bdb19e08d2f6ccbf1d74d2a3e6679344d3dada493bc32a41a3fe9fc7fc500136fa4949096c8afdbdae120ec6d2b6e3b109b8a8a1439796bfbbeb17b1d4a0 SHA512 186575e4de4fd5f27f9701b5e5a56d8b6eae454bfefd8b13e6cbcee9da795833a567fc7a4fc5331a1498f6c0428599f0ec895acecb410e95e37ed43df58abc8f
-EBUILD nagios-check_openvpn-simple-0.0.1-r1.ebuild 1195 BLAKE2B 27ac3256bd40208834a6f2b137b4c53a01c2eafb2f04a58df62498f76dce7ed43b95dfb7f4e0d9754dfc1d47341c4d415b83f0bdb20cba8c826520c5bc3b3b2d SHA512 68a5f5b6864802b92360d7819f04409ef1def77369769416b05143bc6d52c98293155bcdec9ace15dcf21c5662a0ee93265d00eed250e25a6738f2fb3239ba98
+EBUILD nagios-check_openvpn-simple-0.0.1-r1.ebuild 1199 BLAKE2B 28e50c497f5bf740493fe4e30dac55842ac161b3edeb4638017d78d3bd697f018338d0d712e5d04d17e62cc3b2d3a7ee0be23e73f1e41a97c1e17e1b612d2a62 SHA512 f77299c99202c69d2f789c76e79d46c0edeb02233d86be0c0db35dd4bcbd3f849e3ad126d8c0f1d837b103bd83422964c4e4571e1c239c668edaa6c3da5dc7e0
 MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742
diff --git a/net-analyzer/nagios-check_openvpn-simple/nagios-check_openvpn-simple-0.0.1-r1.ebuild b/net-analyzer/nagios-check_openvpn-simple/nagios-check_openvpn-simple-0.0.1-r1.ebuild
index e08a6ef0d41d..c7b69cf87e78 100644
--- a/net-analyzer/nagios-check_openvpn-simple/nagios-check_openvpn-simple-0.0.1-r1.ebuild
+++ b/net-analyzer/nagios-check_openvpn-simple/nagios-check_openvpn-simple-0.0.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 MY_PN="${PN/nagios-/}"
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index eab93682e4c5..0a8ba8a0021d 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -2,7 +2,9 @@ AUX 99_nagios4.conf 368 BLAKE2B 147f4b73bd2f7d71dabb56f646399b939d3a87c288efed9b
 AUX lighttpd_nagios4.conf 325 BLAKE2B f89b9d5aed8305d54f76adf29c65ba20bee74b6c82d149c8b0a786dddacc58c62337072691136c486d4050d1e3bce82420398d5f525ebc0bb36eefdf3a6a2e7f SHA512 a2f854713512ee8ee5c451235beb6ffccf2e04617a98619c6de807a5abca0a424e0581c34b4d255dcbc108e677e18bed25dd33e3d38df8fe10d7d8d4fab015c9
 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-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766
 EBUILD nagios-core-4.3.3.ebuild 7467 BLAKE2B f337eabcfbd918295f437ec735917fda59e0695ee2a6800eea4a15d9f49b1fb63ee135498c8556c0c1a545f7ff0f0141abfb2080a605f19928a5036cac1fdfac SHA512 250b84f3b417756fbb9034af2a909c94c7c2ec7e1539f66590f84b4ff3735314d403b8b6496880c9e0aee2f4052dd7d7829779d1fc4ae78e01f53449abe206ab
-EBUILD nagios-core-4.3.4.ebuild 6644 BLAKE2B 74ea9541876cb35aafbae6721c096e572200b8aa0975b9867ea535a6878d4786c4d552c1f08263a5e5ef2c534b562223726dc248499a793f3a86acf29deb58e5 SHA512 7e51585249db59f040033e22ec2043dbae6cc6e96117f87ded0a4ce4049b4dcf6bdc10d597233f3d5fec95ec60842bdb98f3bf354665d9f4c1ef4ab27cd038e2
+EBUILD nagios-core-4.3.4.ebuild 6643 BLAKE2B 5ba2d8ba564d053abacf30df936e8301ef465a42b3ac540a97d1416e939319e5bacec7ea482c9383dd088d90c8b3ab6a4bf07665f557a35a876dba44dfa4f94e SHA512 a0e4a8d19f9675e0f2694f34e244873b8cc0f926794fba11b848a232f5933213a636e77ddd6ee8ed4573138f19ea8a2c347b05acd86dcfe65c09353adf914b49
+EBUILD nagios-core-4.4.0.ebuild 6650 BLAKE2B 71f116cd32789faa2bc1d4cbccf4042043da69dd26c1c561af86cd56a58c0ba5f48e84b2fa50c01a90bfd696787656921793079c97422a336a0483cba556f34a SHA512 701adbe2152b67cde427b279d201bb157d8c700a3457bb45eb50853185e0612b99a385e384b4c6ca0b9667bce68a6dee6b57a47dedaeb4db3398c49b95a06104
 MISC metadata.xml 1466 BLAKE2B 655e382c72b7fcf8f4283055a503e2ad79dbfc695f730980543e6a7381f5aa093ab279341cd2df19a1d5e5053b2c686ecf6884c541a7b984dce60fc1ae4d4599 SHA512 51f819fc2cbe3b87ee96b048fd0e622f78673a29d5b42b2b8f1d963f6f71ead679b057863f5f1a56e997c1e19ff26edf52697c02f79ba89ed6a5480d0ae2296b
diff --git a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
index 5bd7da55c5f0..ee472ba7a10c 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 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="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.0.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.0.ebuild
new file mode 100644
index 000000000000..ec0577881b03
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-4.4.0.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 ~hppa ~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/Manifest b/net-analyzer/nagios/Manifest
index 7ea8c5d21cec..764ae619b7ee 100644
--- a/net-analyzer/nagios/Manifest
+++ b/net-analyzer/nagios/Manifest
@@ -1,3 +1,4 @@
 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
 MISC metadata.xml 1110 BLAKE2B a3577be74f7ae7da47c1add86da6b9cd2972ebea1e4e4241886027e7c4aecb936ffa776a32bcc0b77498c393ebb4c81aa9a98a3c8d45cbd5556f8b9014384e52 SHA512 7614b25879899b4939a136de6cd4cbd3995372747e95d2d6b90ccd8e074800b6acb738df5f9c852625c34f5a72c3072c0dec910266068ec8a72184f75aa204e1
diff --git a/net-analyzer/nagios/nagios-4.4.0.ebuild b/net-analyzer/nagios/nagios-4.4.0.ebuild
new file mode 100644
index 000000000000..a29da55bee71
--- /dev/null
+++ b/net-analyzer/nagios/nagios-4.4.0.ebuild
@@ -0,0 +1,15 @@
+# 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/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 56d2f170a10c..dc9cd27b654f 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -13,7 +13,7 @@ DIST net-snmp-5.7.3-patches-3.tar.xz 3176 BLAKE2B 1a71d6743afb841f664c6058e32c7c
 DIST net-snmp-5.7.3-perl524-2.patch.gz 523 BLAKE2B 6762795cd6bcdccd5b49899cf572d5a498f3ab7fd20af69fad5f3fe45880e40f2aecfb0e9443a2a10773e25323ed5d0f271446d8fc03102e70fa8efd79e0d118 SHA512 bede47234b809d67f33c46654f3d09d0b255d835fb97eea23bfa888922dfb80ad287c305596a6b041ed03ec91dc7c647ecd54c3c79e0b4ce08978332de3cc007
 DIST net-snmp-5.7.3-perl524.patch.gz 9072 BLAKE2B d870e195bccb8178827791c9bd495d5c13a8848d176ae72b1c6b54b38eabc3b5aa4842d1841f422e3a71d9e9129b2acf303e8961ce98f82f5d9310c3a65e671d SHA512 2d3184ac7c96f75af5bf8c8d23f33d5636c701e052a638e5403a8d5aa34985abc38f6a366ba09a1d8499a05fd71d939a7ed4d530661e56a726386603b6f6e6a4
 DIST net-snmp-5.7.3.tar.gz 6382428 BLAKE2B df036da09658fdb4c52a99696fb6374cd582bc8da765e212285478ffb16c8725ddecd37842aba7835bc90ea74437ce00491dff569b1ce2c7499acf46968b3935 SHA512 0758bba5844cfd6c80959ac16b83906a2f830ba49fd0ab1bf9e191dc6a79d312a2e4760bd53b3e1a1c82759481f0064d088d5a3cf475d84b25679a6bd0f049bb
-EBUILD net-snmp-5.7.3-r5.ebuild 5124 BLAKE2B bc83af6d6a2ba7cb60f02794682896de64ed72a6211d8fb9c2b78611c92882142ed9d89997614f65f92c7341887d4d1094c8cb2eedba61caf608a667c95a5a34 SHA512 46bb9b542caa3a20c88286a9d637f6d87b165fed1f441c4849a4898290da48afad17ff2d50208b1935d3048f0a3fa95b35f509ddbf349f618a558ea3d4bce206
+EBUILD net-snmp-5.7.3-r5.ebuild 5123 BLAKE2B c6fdb0374d6860e846d4011e96e9928f6dc625d3a5fb87f241f98d9b13c2aac79c8dc6eef0d08069a4652d643c82ffc1e41af2233c815b3c0bbbf3e33b540a52 SHA512 638d77772285508a3cc2d990c1ae66e2b06be6af34e07f2a1ba6db04de6f71fb369c3c4d51ebb30eb4035776b073032a74d44093c6186adfd0d1b3ed2b239561
 EBUILD net-snmp-5.7.3-r6.ebuild 5156 BLAKE2B b2b067fb782e94d50da0297bd01f31bfbfdaf0bd405385d66630494b1a597c037940ff7d982328abe40eb34355e02a689f2726b6d5f71c75f7d8055947591d7e SHA512 57771f89b6871f90d6195e12145d76e3116fd40f3c0f1aa871bdd3138026d32967e7f0d9a5eebbc7098b940be5c2a0bb06635e6402701e789c1dc35b6a3d99b7
 EBUILD net-snmp-5.7.3_p3.ebuild 5221 BLAKE2B 810863641282b8a054e0f1fe587ead591a4a3ba7fa7d734b08e16856adae01e11de00e9ad06a0bfc19b17c3d0126b46ecb2a58ce5bc569c30cbe27be71160ead SHA512 f7e0564698e168a6d3365e4744d6776c70ca7a4def86740f19eef3d37f53b88fa231f6e53db004b95213ecd05098a60716b79d9f87ca7b90a44f26149d0357ac
 MISC metadata.xml 1142 BLAKE2B d026289018d327a888079b9c3cb7cf65dff58dd87735f7317d15d78698fe307d4dad2dfed10adab428eee0eb3abf357c82554b0861029a70fb60b82537601d84 SHA512 76efbc8444b344164960e671df273afaadbb4b64e73b136f559d4f039ee4b145f8ae989d271a8cc025edc917e4213828e0c77f6e5b0258b4c0eb9653c98c58c0
diff --git a/net-analyzer/net-snmp/net-snmp-5.7.3-r5.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.3-r5.ebuild
index 6e71bd0135a8..fee79b1ccb09 100644
--- a/net-analyzer/net-snmp/net-snmp-5.7.3-r5.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.7.3-r5.ebuild
@@ -25,7 +25,7 @@ S=${WORKDIR}/${P/_/.}
 # GPL-2 for the init scripts
 LICENSE="HPND BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="X bzip2 doc elf ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib"
 
 COMMON_DEPEND="
diff --git a/net-analyzer/netperf/Manifest b/net-analyzer/netperf/Manifest
index 7c571b4c6683..cf969eb335a9 100644
--- a/net-analyzer/netperf/Manifest
+++ b/net-analyzer/netperf/Manifest
@@ -10,6 +10,6 @@ DIST netperf-2.6.0.tar.bz2 1032953 BLAKE2B c13e6c49b975273e2de97a32e1fbcc2265639
 DIST netperf-2.7.0.tar.bz2 1024430 BLAKE2B 1263a2b3cee0790e4526245e522d29f8692a5a3e9d3b41468d1010bbee4d606a06904d9e0c4ac0af457bde562a476434be4c62a41e3c0dbf0e5c3aeb2ae5652a SHA512 5fb37945bead831247de9c8ba86b33f134ba39e753b483df72de97f536d0846538dadf61acc2dee57f04ab5d16a92afab4890e79a5d7ffa863afd526267fffad
 EBUILD netperf-2.6.0-r1.ebuild 1666 BLAKE2B 30d4e0257d2c633d4650c42ee71d8848371074f61d71c1dc84d0b94d9a44553269224b1c11d26754c372b5db299445efd98aea6da3312cd7406f58f06fba2c24 SHA512 59808e4719f87cdff58a090c8669f481d4c850a08ed8023e5fd4be837b23f7faa7b99c8f91dca300586e1d70cc20d1a727c433fe264b26c6b68916b9f0e68194
 EBUILD netperf-2.7.0-r1.ebuild 1877 BLAKE2B c117075369a78b86c82e0edd569696a23c267b57f971baa2d37bbf12e2235904f1e53290e59a796657a46fda64e0b57b355680c17d7332b238011ef1d1a9f152 SHA512 a1cbc73bf527e97afdfa88b3644d2f459138363fc8232a5a657b502214fd0d3eb0b48579831df7c56c07ec954b41724ee7cd1555a74d9229ff796cb50e7c7e6f
-EBUILD netperf-2.7.0-r2.ebuild 1928 BLAKE2B c08bd8b114f4af64464a990afdaade4b20f707a76bbb917a59ea60023a8e2e9dd7b8e18b93461ebd55d4ec889fbfdc0279ad6a9395163480fa09c616f25f6c00 SHA512 a4258a977642cd0a174bf41493d5526b8ea447e39fc01282f5d7d7b2f0da3ea400203b68522dcfe51e8da0d335167c9d0dc1c3e202d532d34cba23932875cca4
+EBUILD netperf-2.7.0-r2.ebuild 1924 BLAKE2B 79d4095a72c5a0c49f89b4a64e378dc56d51832123edfeacf6ef098d181be693f04d9e27ea4500922d1aa670e30c8f36dcc843fd7cef3740a9c3d0ff86ddbe62 SHA512 eadbec36ac38e99e0d8897fbb536125448a95ab2ce221ee25b4c5236bc997d553941b30f15ce5db7a5a5cd010f1fba8cca823c631783ad5f08fbfb345a243ea9
 EBUILD netperf-2.7.0.ebuild 1727 BLAKE2B b53213319cb0d24dc783d595d5938ad247dcf29d52acf63d045df6a9112f735dd8e08e04f3fb26fbeef3c2ecf44cdbd2d91b3fbd4086971347fdb003b99cde2f SHA512 71cc28a007eb990c0325ab9592f5f7478ffd2b7484cc2ab4da4cab06e1f7971f1688b401b2951f7dde5dd3b1bea2cf58340b1e592b3d0738509cb48cab0da716
 MISC metadata.xml 775 BLAKE2B 7f097a5c5390a88319c63497486a12367b5b89ac7979e22271581f6c9b6eaa5c69209f4d3cc82c57e8a3b0d0c0469378cd73579447c56d9991379af46b7fca1d SHA512 c1aaecd84a7fe73d798842ed1c117357809069f3f8c30a6920abf6641c46a5885e170dcecf7f2172d376b7f010e6dd07c47e233f15289c5de432550f1d05845e
diff --git a/net-analyzer/netperf/netperf-2.7.0-r2.ebuild b/net-analyzer/netperf/netperf-2.7.0-r2.ebuild
index c27563056689..5d78d14f20a2 100644
--- a/net-analyzer/netperf/netperf-2.7.0-r2.ebuild
+++ b/net-analyzer/netperf/netperf-2.7.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ inherit eutils flag-o-matic user
 
 DESCRIPTION="Network performance benchmark"
 SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 arm64 ~hppa ia64 ~ppc ~ppc64 sparc ~x86"
 
 HOMEPAGE="http://www.netperf.org/"
 LICENSE="netperf"
diff --git a/net-analyzer/ostinato/Manifest b/net-analyzer/ostinato/Manifest
index 5bb0ae11d87b..cf3455d662d2 100644
--- a/net-analyzer/ostinato/Manifest
+++ b/net-analyzer/ostinato/Manifest
@@ -1,7 +1,11 @@
+AUX ostinato-0.9_p20180522-buildfix.patch 542 BLAKE2B 7916e581c50b3090415cfdd2607e9614e9fffd057e2b2c8d32458fa2582e30ad37c4c334fb7a610d059e5a4951a376ebcc5795511203333333c102abfd7be1ab SHA512 b7647a4d485e5a814cc75cc86bf1552c78d1498363eb1fafcb0ec17dc9c2191d93744dd6d58c47b704ed3e8f756bab5480b31b67ce5e1ace250e64c4523130b7
+AUX ostinato-0.9_p20180522-no-modeltest.patch 243 BLAKE2B bf382374a803ac4be4e9b00e216ce61c918e3f097b3034337fdeeadeb131e7a0ed8b028b1b08f107d94438baad35be6d7606874439850ddb9f0e5176ffa28a15 SHA512 b82fed38f8b4bccca3e6de599508c1c65c8bcf83dc88ca6e4c383f04eadc6fa3c3bfd2ddf31e5eaa26b8445f674e76600712659705bd2061a1ed0646af022c6b
 DIST ostinato-0.8.tar.gz 424104 BLAKE2B 5244ac9577da3fc99b714044a349e4003f0e64034fad04e241b43288a234f86f282ba0169c7e27c358d7ee3f4dc255b2408ef23f030d25f1edfec891e8ae17f7 SHA512 ecb3581736bd8dff44fe21082c270febc2ead4530cfb57997f218bd0b61a85993208937729374dd09c67fdc24eb2b9adfe5b3750ee6daef90b1e7dac2ea0737b
 DIST ostinato-0.9.tar.gz 413756 BLAKE2B cc1cb6d4db614b1968c27d7cdbebb977f39e6be8ec1a39b08f7e34d9a1a4d6b7c0c034f245b6b562c72b5dbdba9fc04c03b1cfc0c01044c249bcc2bc67af357d SHA512 a50f6e20d8a2a4d76ca43a89feaa774778981377ce1f4c731ad8b1a97aa658013082fb85cc3f4dfdd888d708c45c8093e55facaa7f02cecbd2ce5228f57e2e14
+DIST ostinato-0.9_p20180522.tar.gz 424128 BLAKE2B 69a15e523986cd34f89669fab0ed64987f68ea7d82d481de418c2d86f3b325b5c1ff9081db8c77532b603b01f504c37c24a4f7f5b7244657cac8b2f707bc7bdf SHA512 7d8359b193c98165ea376ad0ad57e01b782e35a7b887465d74c67ae1cd434036e8beb67593c569e15a87d5d0c7f602c9f01acf068e9ffff0c0496ab4f889a83a
 DIST ostinato-src-0.5.1.tar.gz 291529 BLAKE2B 207a3b423040e82042e7e68e2c7ffaf304a0c7e7d1578a994caf090ee934e10f169b9fce96724c0527268fb9f656b25bf3baa19b5f1ab6a06ffc2b8925b1c952 SHA512 d06b59dc2129aba01e5a42a677339d6e8f353f9c7c027226e66c8a5af94ecb48e8450e7770ae5e179131fa4cfeefcc827fb9a18be4294ddfcd7a471ec26ee06a
 EBUILD ostinato-0.5.1.ebuild 508 BLAKE2B 1857e47c74bd91eea56c551e95e63b667388ecb389be9939d4e2eb37898b84416d9b151bd71952567973fdbdd22bc08f85fdfc963fc208ff716e461c45542905 SHA512 589777f1c32dbeb62411f028527259c57fd86e5e9bf27b527650d517c68e9c05a77d11ecb213d88610f468db4a756d94c817985dff618a260a7110427bbe216d
 EBUILD ostinato-0.8.ebuild 550 BLAKE2B a4e7b8e65a2278db94b3b5d284b97b8fdbeab2c70e9c81e1cba9ce90768e65f818a0a2b77ef5ceeb181fab1364682f8b45b2f5012cc3fda4aa70d4103ba97a3c SHA512 a7d654097e7fbd013e1413ebb471b6b27abfeecc0d26f98f49a424e47c58cd9ea905fe19e49b15043c5ec8c8a7166c9f56cbf5b8b6210acd5863bd18cafbb82d
 EBUILD ostinato-0.9.ebuild 654 BLAKE2B 71bac7438fc30945a49181cdf26b31a4b5f61d9a2986acd11ef5895f8c2c623d3c54a55a2c733db9b68ddfb27bb00c4a92ad0793bbdbc9a2cbf41cd5e00018f7 SHA512 cfcf4573ac143eb6f8d07ef0e49a6539fadcfa8d68214dcef455bec042f45af335e6b3bbf8eaae0fd30ae1a1d9402c7b686f45b9896da721d9227ded7c1f4023
+EBUILD ostinato-0.9_p20180522.ebuild 847 BLAKE2B 7314d2836b45cfa187f21362d4958ff095e99d5720448cf0e631e989302da4acf612778c5025686e4c4200ef1911b89c2cfae320b316312ea498add1a4d03d7a SHA512 dfe64994620dffcfb52100c6974592340d0af4318a749293c1608ad3bfec9ba6ab5088349eba41fe95e7eadd018d7304eeb0b853ce16044f52d5df92ca3bcca8
 MISC metadata.xml 325 BLAKE2B 7deccc14079e605af5cd4a154a6d7ba4f69b2c7472c0f3ebb59c968bbb3c992216b0a367973d6ed729b0b117594ff47d1e9401c1750f5a6627aefca6008aab5f SHA512 65ed2d54f5a181004ea4900cd1b26b632fe57809f4903f9e4bb79b3440e7e3d72effc62725be9e788922e37b38f34b4363c30a3adda9f9483c0a983ff2f9fe09
diff --git a/net-analyzer/ostinato/files/ostinato-0.9_p20180522-buildfix.patch b/net-analyzer/ostinato/files/ostinato-0.9_p20180522-buildfix.patch
new file mode 100644
index 000000000000..ff09d689ae5c
--- /dev/null
+++ b/net-analyzer/ostinato/files/ostinato-0.9_p20180522-buildfix.patch
@@ -0,0 +1,17 @@
+--- a/common/mld.cpp	2018-05-22 18:18:21.000000000 +0200
++++ b/common/mld.cpp	2018-06-26 13:59:58.562569302 +0200
+@@ -24,6 +24,14 @@
+ #include <QHostAddress>
+ #include <QStringList>
+ 
++template <> inline Q_DECL_CONSTEXPR unsigned long qbswap<unsigned long>(unsigned long source) {
++  if (sizeof(unsigned long) == 8) {
++    return qbswap<quint64>(quint64(source));
++  } else {
++    return qbswap<quint32>(quint32(source));
++  }
++}
++
+ MldProtocol::MldProtocol(StreamBase *stream, AbstractProtocol *parent)
+     : GmpProtocol(stream, parent)
+ {
diff --git a/net-analyzer/ostinato/files/ostinato-0.9_p20180522-no-modeltest.patch b/net-analyzer/ostinato/files/ostinato-0.9_p20180522-no-modeltest.patch
new file mode 100644
index 000000000000..5e7733aeed10
--- /dev/null
+++ b/net-analyzer/ostinato/files/ostinato-0.9_p20180522-no-modeltest.patch
@@ -0,0 +1,10 @@
+--- a/extra/extra.pro	2018-05-22 18:18:21.000000000 +0200
++++ b/extra/extra.pro	2018-06-26 14:15:49.162937000 +0200
+@@ -1,7 +1,3 @@
+ TEMPLATE = subdirs
+ SUBDIRS = \
+     qhexedit2
+-
+-greaterThan(QT_MINOR_VERSION, 6) {
+-SUBDIRS += modeltest
+-}
diff --git a/net-analyzer/ostinato/ostinato-0.9_p20180522.ebuild b/net-analyzer/ostinato/ostinato-0.9_p20180522.ebuild
new file mode 100644
index 000000000000..1beae2abfc9f
--- /dev/null
+++ b/net-analyzer/ostinato/ostinato-0.9_p20180522.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=9a4e7e7550c6b20a8f0f1393a55036492c1b7703
+inherit qmake-utils
+
+DESCRIPTION="A packet generator and analyzer"
+HOMEPAGE="https://ostinato.org/"
+SRC_URI="https://github.com/pstavirs/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+#KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+#https://github.com/pstavirs/ostinato/issues/173
+# libpcap dep is versioned to pull in the fix for #602098
+DEPEND="
+	dev-libs/protobuf:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtscript:5
+	dev-qt/qtwidgets:5
+	>=net-libs/libpcap-1.8.1-r2
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-buildfix.patch"
+	"${FILESDIR}/${P}-no-modeltest.patch"
+)
+
+src_configure(){
+	eqmake5 PREFIX="${ED}/usr" ost.pro
+}
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index 3bbe4ab8ceea..af9095675c26 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -10,5 +10,5 @@ AUX rrdtool-1.7.0-disable-rrd_graph-cgi.patch 1249 BLAKE2B 91dc764b7629ec517ff35
 DIST rrdtool-1.6.0.tar.gz 2186538 BLAKE2B b56ef79b9d45a65cacd7c1d8da2158dcaaff3ebc2ffc0640081cdc2fa3ac643be1ce48a2cac60427a836dc3e457ddb042c95533d0ffbcdefa2978f5659150391 SHA512 45a8f16a2bda9d497c5f39de80236adb7a5bd054a14755c4d130f21cd6430bd0a76caef9632994be56fd1ea2364eb218687ea8ebf945a71ca411221c248f3ebd
 DIST rrdtool-1.7.0.tar.gz 2849994 BLAKE2B f7a91fa661728850af55356a69b61ea1d4343c79579823e025e0a0757d1dab0d2cda6387197ece20e07f33a657743350cadfaf6504500f13be472d18e8826a3f SHA512 36d979561601135d74622eaf183701de15cba5e25118f7a308926a695ba84ecb33c3d16511bf4bc80cff055853e2eb85065bc4ed8aef19fc0277c6430ecd319f
 EBUILD rrdtool-1.6.0-r1.ebuild 4246 BLAKE2B 02403955767076ad3b3cd33532bce9b929ddeaef9f4e864f9166058a04b2c66b6e95f6ab14ddbe75b04b3035719883017e075d01342b8d5d19376b96b1683665 SHA512 58357968c80b0894410e4857dd65c7c92ff14a1cd1b6b3293f98935464b3c0e1e2a37291977c18947c083d1f203069b20184b6bb2f140ba241ab8051473b114c
-EBUILD rrdtool-1.7.0.ebuild 4304 BLAKE2B 1ccb1a2f9db16542b09fef8b99a76ac6a1f825f8fe68be9a29cc52f4d40dade564540bae98b067a9b20bf8c2e63038845f9cfc1dc4a06a608821e102f0fe53e2 SHA512 b407cb0f83a846c0621e1ae33be704195a6584e0a09994ed0b51cbe8a0b93ec674790d45ee0cf6297411bdb6da9b7760a5cd27fae78f9ff27259b7762febfc48
+EBUILD rrdtool-1.7.0.ebuild 4308 BLAKE2B 3ff52745ab04139e19136e930e8eb6ba0d2796693fb35bd1aa1ac88dc2181d395cc9c987590933310bf643166ad523786e2f20a9d1dbc3a9fe5393f0fde044c0 SHA512 a3ed4704b13c7081b7f00ab20ed8d5961325fee67bdfba281ce795f53c6cf9e6a648fabff472b8d778c5ee0196ca13841cfd5b29ef971afb66fc57c80876db81
 MISC metadata.xml 486 BLAKE2B d4e04c193a7b46a532791a0a448c7db4acaa4b4d4d775db70b6ab843ba32b616c91b516dbaca5b4e0a30649743553325a134291edb0ee17fe2ca049ed1e720ff SHA512 ddca3904aa3e0f1d2f543ae9329298a2dc69bbc0803c568d0871bb5ace21d2dee4d0b226e5eef0258fd59dd2cf046ee807afaa588e31db35e574f3d707894a23
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.0.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.0.ebuild
index 955b659434e5..824cc09eb77a 100644
--- a/net-analyzer/rrdtool/rrdtool-1.7.0.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.7.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 DISTUTILS_OPTIONAL=true
 DISTUTILS_SINGLE_IMPL=true
 GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit autotools perl-module distutils-r1 flag-o-matic multilib
 
 MY_P=${P/_/-}
diff --git a/net-analyzer/smokeping/Manifest b/net-analyzer/smokeping/Manifest
index d6147f7cc96a..54b9c1bf12ed 100644
--- a/net-analyzer/smokeping/Manifest
+++ b/net-analyzer/smokeping/Manifest
@@ -2,15 +2,12 @@ AUX 79_smokeping.conf 351 BLAKE2B 97e09d4cf9d4b1fe4b334165a0f46bb11dea32cf6a2678
 AUX smokeping-2.6.9-pod.patch 482 BLAKE2B 8490774fffcdac52d5375bd7155a1246f03a748eb6d7e365dcb6b82d5d4e5cdbdd0025793daf68a4605137c03447463c5bea86bdebcf1ac48e51309abe0f5ee1 SHA512 3744f97a8f817c7b9d5da4fe130377658d74ac1be78a00dbc39b501716fc2d6b9fb2188f9ff3c57da5c36b6761e9099d0ef85a7600174de8fda01a8898274b71
 AUX smokeping.conf 32 BLAKE2B ea64af0cebbb847c89503b3d893c902ab2d761afbce6594731d8851cc5f9a81118c9ce9ff76888b0bddcbf6b4341a47a76a74f64aecdc3d1610510714f119ee7 SHA512 75863f16f8b57ca9ae7c7d65076acaf28aac66fa2d52ed78bce2bb3a4938dc75a1e8ed54236c52c3965b170a8348145780dd5c0f3d0fc8c95f4b88085252a4ef
 AUX smokeping.init.3 1737 BLAKE2B 0c1ad0e4c5dd843097eadbdd2e2309f9f89c5f336ae20938680f2629c16e6ee265a56a4aaa26b40243d9d85331775315ac4eb5235eb51c7ff6d981ab2dd3a683 SHA512 87386971b42bf842c6cf59f641576cfcfd7439fe9f10139730b0c73acea610945d634d3effc3a5db793a71e2e625b49184a02813cbf34473dd94ac4a3931ed67
-AUX smokeping.init.4 1757 BLAKE2B a47cbbc27e38333490b615971f795ce3a7a6efebd03ad28244ab3a72368d08eca8cc3ce38bbb92915a604f586a04595d857d83c3adb33b213806f62ef09864bf SHA512 5e32a248899d79ea112595591bd9457c073c8276d8bb124b4f765bc9654bd5dac36866344c8c444c98ba4cde32829d7092067e73db5bd3c38ca75f7679a875f1
 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.0.tar.gz 8914621 BLAKE2B a139fdcaafe37c61695ea2e31e3ddaeb4389f754f28fd41318db120f2ae5f4b5f355ebfb5e0c852b48e2e6872194952bc3733ff5f6bcd2886859a1c276835121 SHA512 17ada10e2cdc7966e81e589dec603fe77bc0a273790734b36342ff2b8ac3d5bca6797f6eb95a6e2e22a576b7bb5d2ca4232b4fb23057b360de9c156d141ed0ca
 DIST smokeping-2.7.1.tar.gz 8919251 BLAKE2B 91f348b573d5a7ce98e8b51c96d9f45bb0af21cae4b049ba113bfc97c60800d8fdea0c05eb5414ec861f07f30170abf64ee34e0e29899528c01283ddab0ecde8 SHA512 c7208a40725e5694813a0545d6f8b663bab49739fe716bed5fd85ed6258c1c0abde4a18a0678988fff067ecc7807c83313abf12c04b935377b0b7158f07d8626
 DIST smokeping-2.7.2.tar.gz 4614968 BLAKE2B 7cf9f4bd47f3a5419549b0a62fbaca664b70d73af0d57dc005d32030e1e86556f5100d00ed43743aa2a3dffa59bbe00129309b473fc261a7dcdc6225d80a8921 SHA512 e912cdf7ec9af871b9a4a90d787bae04feb21e40c1259bb835eb25b098e03023d7424e53d344ed459f8423260b0eb311f4dd12824195da9647554943685f4d07
 EBUILD smokeping-2.6.9-r1.ebuild 4197 BLAKE2B e29dbdeefcf15bcb30c7d5e3a3355075dae01db3f1b15141d4f0a04925f0c578a7a01e1859436ee3e47c8b3cc09658c72c0a1e1218cc89fbcb2169c47b0235d2 SHA512 4c8c205dedbef01738471b8936f1540d2dba41eb6d0a984ddc758995215c12a6a383aa1a419182c6443cd96d204f8ab563b0a5225bd7b5ff7ce06a0f5de43a54
-EBUILD smokeping-2.7.0.ebuild 4336 BLAKE2B d06dfba5688cc9bea96b0b5eb2a38ed8678069a7c61f961ba282a0e4f0c4a39579bb97edac4080772f96bfd31c15a3846397da89d3bf7840aaf3125226151176 SHA512 d875b8ac3fd1de36ea93dfa213475a20d97d70dd306ddb3cb0101a8971fa4bcb3bfe4569e4cbd527edee38659a6edd7a5f4cbfbcf8bc028c2d8702978cf3c613
 EBUILD smokeping-2.7.1-r1.ebuild 4152 BLAKE2B 3564d7940571f209d60c38c313c6569716c976a59c241dfabc727d32456ee94321cd9a577b0dbd647c2dc01f68bce172958cc9abbe07ea6eeaa884e5ef67441e SHA512 c2fae1302b759cf4cc26aa5b20c06a9ce3d11250ac53bcb115b3596dff0bc0e893b740b9a0969d219fe39c7dd3cc6a807e26526acd433b729634b286c6c81796
 EBUILD smokeping-2.7.2.ebuild 4152 BLAKE2B 3564d7940571f209d60c38c313c6569716c976a59c241dfabc727d32456ee94321cd9a577b0dbd647c2dc01f68bce172958cc9abbe07ea6eeaa884e5ef67441e SHA512 c2fae1302b759cf4cc26aa5b20c06a9ce3d11250ac53bcb115b3596dff0bc0e893b740b9a0969d219fe39c7dd3cc6a807e26526acd433b729634b286c6c81796
 MISC metadata.xml 609 BLAKE2B 80a690cf6d514c95f27e370c0417cdc1787a0e149e7791bdd3684b195d2cf6ada9543d1001fd5353a00e05a01c62272b73e09ec838d9ea927b4c3bcbb274ab15 SHA512 cd5bbbf1af0cadf236c3385628a1392c2e5379958e4f002d71230ed9e7627989cfdee7e0a9fd584f94c4c29bb1756f9ade81df0888f4668f9b3a8ab9e31bf727
diff --git a/net-analyzer/smokeping/files/smokeping.init.4 b/net-analyzer/smokeping/files/smokeping.init.4
deleted file mode 100644
index 2e38a60ed636..000000000000
--- a/net-analyzer/smokeping/files/smokeping.init.4
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="${opts} dump reload restore"
-
-depend() {
-	need net
-	use dns
-}
-
-checkconfig() {
-	if [ ! -f "/etc/smokeping/config" ] ; then
-		eerror "You need /etc/smokeping/config to run smokeping!"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	checkpath -d -m 0755 -o smokeping:smokeping /run/smokeping
-	checkpath -d -m 0755 -o smokeping:smokeping /var/cache/smokeping
-
-	ebegin "Starting smokeping"
-	LC_ALL=C \
-	start-stop-daemon --start --name smokeping \
-		--pidfile /run/smokeping/smokeping.pid \
-		--exec /usr/bin/smokeping \
-		--user smokeping:smokeping
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping smokeping"
-	start-stop-daemon --stop \
-		--pidfile /run/smokeping/smokeping.pid
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading smokeping"
-	/usr/bin/smokeping --reload 1>/dev/null 2>&1
-	eend $?
-}
-
-dump() {
-	ebegin "Dumping smokeping rrd files to XML for backup or upgrade use"
-	if service_started "${myservice}" ; then
-		eerror "You need to stop smokeping before dumping files!"
-		return 1
-	fi
-	for f in `find /var/lib/smokeping -name '*.rrd' -print` ; do
-		f_xml=`dirname $f`/`basename $f .rrd`.xml
-		rrdtool dump "$f" > "${f_xml}"
-		chown root:0 "${f_xml}"
-	done
-	eend $?
-}
-
-restore() {
-	ebegin "Restoring smokeping rrd files from XML dump files"
-	if service_started "${myservice}" ; then
-		eerror "You need to stop smokeping before restoring files!"
-		return 1
-	fi
-	for f in `find /var/lib/smokeping -name '*.xml' -print` ; do
-		f_rrd=`dirname $f`/`basename $f .xml`.rrd
-		mv -f "${f_rrd}" "${f_rrd}.bak"
-		chown root:0 "${f_rrd}.bak"
-		rrdtool restore "$f" "${f_rrd}"
-		chown smokeping:smokeping "${f_rrd}"
-	done
-	eend $?
-}
diff --git a/net-analyzer/smokeping/smokeping-2.7.0.ebuild b/net-analyzer/smokeping/smokeping-2.7.0.ebuild
deleted file mode 100644
index 5c477c95655e..000000000000
--- a/net-analyzer/smokeping/smokeping-2.7.0.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils multilib user systemd
-
-DESCRIPTION="A powerful latency measurement tool"
-HOMEPAGE="https://oss.oetiker.ch/smokeping/"
-SRC_URI="https://oss.oetiker.ch/smokeping/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# dropping hppa and sparc because of way too may dependencies not having
-# keywords in those architectures.
-KEYWORDS="~amd64 ~x86"
-
-# removing fcgi useflag as the configure script can't avoid it without patching
-IUSE="apache2 curl dig echoping ipv6 radius"
-
-DEPEND="
-	>=dev-lang/perl-5.8.8-r8
-	>=dev-perl/SNMP_Session-1.13
-	>=net-analyzer/fping-2.4_beta2-r2[suid]
-	>=net-analyzer/rrdtool-1.2[graph,perl]
-	dev-perl/CGI
-	dev-perl/CGI-Session
-	dev-perl/Config-Grammar
-	dev-perl/Digest-HMAC
-	dev-perl/FCGI
-	dev-perl/IO-Socket-SSL
-	dev-perl/IO-Tty
-	dev-perl/Net-DNS
-	dev-perl/Net-OpenSSH
-	dev-perl/Net-SNMP
-	dev-perl/Net-Telnet
-	dev-perl/libwww-perl
-	dev-perl/perl-ldap
-	virtual/perl-libnet
-	|| ( dev-perl/CGI-Fast <dev-perl/CGI-4 )
-	!apache2? ( virtual/httpd-cgi )
-	apache2? (
-		>=www-apache/mod_perl-2.0.1
-		www-apache/mod_fcgid
-	)
-	curl? ( >=net-misc/curl-7.21.4 )
-	dig? ( net-dns/bind-tools )
-	echoping? ( >=net-analyzer/echoping-6.0.2 )
-	ipv6? ( >=dev-perl/Socket6-0.20 )
-	radius? ( dev-perl/Authen-Radius )
-"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup smokeping
-	enewuser smokeping -1 -1 /var/lib/smokeping smokeping
-}
-
-src_prepare() {
-	default
-
-	sed -i -e '/^SUBDIRS = / s|thirdparty||g' Makefile.am || die
-	sed -i -e '/^perllibdir = / s|= .*|= $(libdir)|g' lib/Makefile.am || die
-	rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} || die # dev-perl/SNMP_Session
-	echo ${PV} > VERSION
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/smokeping \
-		--with-htdocs-dir=/var/www/localhost/smokeping
-}
-
-src_compile() {
-	LC_ALL=C emake
-}
-
-src_install() {
-	dodir /usr/$(get_libdir)
-	default
-
-	newinitd "${FILESDIR}"/${PN}.init.4 ${PN}
-	systemd_dotmpfilesd "${FILESDIR}"/"${PN}".conf
-	systemd_dounit "${FILESDIR}"/"${PN}".service
-
-	mv "${D}/etc/smokeping/basepage.html.dist" "${D}/etc/smokeping/basepage.html"
-	mv "${D}/etc/smokeping/config.dist" "${D}/etc/smokeping/config"
-	mv "${D}/etc/smokeping/smokemail.dist" "${D}/etc/smokeping/smokemail"
-	mv "${D}/etc/smokeping/smokeping_secrets.dist" "${D}/etc/smokeping/smokeping_secrets"
-	mv "${D}/etc/smokeping/tmail.dist" "${D}/etc/smokeping/tmail"
-
-	sed -i \
-		-e '/^imgcache/{s:\(^imgcache[ \t]*=\).*:\1 /var/lib/smokeping/.simg:}' \
-		-e '/^imgurl/{s:\(^imgurl[ \t]*=\).*:\1 ../.simg:}' \
-		-e '/^datadir/{s:\(^datadir[ \t]*=\).*:\1 /var/lib/smokeping:}' \
-		-e '/^piddir/{s:\(^piddir[ \t]*=\).*:\1 /run/smokeping:}' \
-		-e '/^cgiurl/{s#\(^cgiurl[ \t]*=\).*#\1 http://some.place.xyz/perl/smokeping.pl#}' \
-		-e '/^smokemail/{s:\(^smokemail[ \t]*=\).*:\1 /etc/smokeping/smokemail:}' \
-		-e '/^tmail/{s:\(^tmail[ \t]*=\).*:\1 /etc/smokeping/tmail:}' \
-		-e '/^secrets/{s:\(^secrets[ \t]*=\).*:\1 /etc/smokeping/smokeping_secrets:}' \
-		-e '/^template/{s:\(^template[ \t]*=\).*:\1 /etc/smokeping/basepage.html:}' \
-		"${D}/etc/${PN}/config" || die
-
-	sed -i \
-		-e '/^<script/{s:cropper/:/cropper/:}' \
-		"${D}/etc/${PN}/basepage.html" || die
-
-	sed -i \
-		-e 's/$FindBin::Bin\/..\/etc\/config/\/etc\/smokeping\/config/g' \
-		"${D}/usr/bin/smokeping" "${D}/usr/bin/smokeping_cgi" || die
-
-	sed -i \
-		-e 's:etc/config.dist:/etc/smokeping/config:' \
-		"${D}/usr/bin/tSmoke" || die
-
-	sed -i \
-		-e 's:/usr/etc/config:/etc/smokeping/config:' \
-		"${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" || die
-
-	dodir /var/www/localhost/cgi-bin
-		mv "${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" \
-		"${D}/var/www/localhost/cgi-bin/smokeping.fcgi"
-
-	fperms 700 /etc/${PN}/smokeping_secrets
-
-	if use apache2 ; then
-		insinto /etc/apache2/modules.d
-		doins "${FILESDIR}/79_${PN}.conf"
-	fi
-
-	# Create the files in /var for rrd file storage
-	keepdir /var/lib/${PN}/.simg
-	fowners smokeping:smokeping /var/lib/${PN}
-
-	if use apache2 ; then
-		fowners apache:apache /var/lib/${PN}/.simg
-		fowners -R apache:apache /var/www
-	else
-		fowners smokeping:smokeping /var/lib/${PN}/.simg
-	fi
-
-	fperms 775 /var/lib/${PN} /var/lib/${PN}/.simg
-}
-
-pkg_postinst() {
-	chown smokeping:smokeping "${ROOT}/var/lib/${PN}"
-	chmod 755 "${ROOT}/var/lib/${PN}"
-}
diff --git a/net-analyzer/speedtest-cli/Manifest b/net-analyzer/speedtest-cli/Manifest
index d8bd930ecff3..a3e69465e6f3 100644
--- a/net-analyzer/speedtest-cli/Manifest
+++ b/net-analyzer/speedtest-cli/Manifest
@@ -1,5 +1,7 @@
 DIST speedtest-cli-1.0.7.tar.gz 21077 BLAKE2B 8bbb9b73f21f9252763461230053bac5d890d19d3f80a81f616bb4535c5e386b70b43c6ee0688ca813fab21f8387fd93df65b1b0254613efbdec93b1807d3caa SHA512 c06c0e80ec00adebc04fb2bdab5b45ec84a32d9dbf2e4fbe7b0461f4b3b1fdcf29048b8c7a906c03dcea0771417317394243bdc6f1bc8fb763e13eafae31a42b
 DIST speedtest-cli-2.0.0.tar.gz 23642 BLAKE2B 042b5c24d084400663548d3110dd28a4c4bad780d46f9f4182ab8d1a323a087970e0ebdff04dee2ecd1bed9b488dd72f4799992c762f631d3cad59aedc6452e5 SHA512 60bde263a06589c609a10e1a881a1b02f7c7426b95778d7729b1388e545713094501914c24ee08f0857c4f445354539b5508825ab1a51df284215ba681dd7888
+DIST speedtest-cli-2.0.2.tar.gz 23915 BLAKE2B 95b88e1666d7bc50c525ae7eb587e1b53babe02549e3b6b81f59451166fdbfb5561daa29e1de308d3ca7340989bcb6e7b43edd84bf371716284c034cdeb21fd8 SHA512 12fa9a5dd8bcb7a7ee68ecc9075dc5c18f089cecf003e7e643dbb6b1c3663f17c2aba48d1e84aa27bff6b66e207d39ecaf874aebad1d71cac772c58b62191723
 EBUILD speedtest-cli-1.0.7.ebuild 662 BLAKE2B c4b2a3cc3fae1300e89ca981959b1468da02ad0e34887413a9d3dc4a344ff61d4f13c8f5e01684d324bfebaf53d2a2a3a09c46c02eb9f6156dd031cdbef18101 SHA512 35d739bc858c8c843c50c03e7889a3b9999c34d171fb8f4d0c5698ae464b83a7a9d977ab0b8dc9a99517a9a6ba610d6fa87f2f572c3487f07a72e45ac3ecf5e2
 EBUILD speedtest-cli-2.0.0.ebuild 664 BLAKE2B e7a99e1d91e1de89eabfe8b481835c822973e9161da4bde276044088bb430b07f5d880fa86c4c4f20b1b940e504534660c54217325d830d322a851243914080a SHA512 70f27e8f337e173384c973b0c574d45942b9b5c39602c687a0df6a32693729cb36ef2c3bcb016e173b2e97c4ecbc2f24c9d3706d4cb5b3bf9e81a85f861c70b0
+EBUILD speedtest-cli-2.0.2.ebuild 664 BLAKE2B e7a99e1d91e1de89eabfe8b481835c822973e9161da4bde276044088bb430b07f5d880fa86c4c4f20b1b940e504534660c54217325d830d322a851243914080a SHA512 70f27e8f337e173384c973b0c574d45942b9b5c39602c687a0df6a32693729cb36ef2c3bcb016e173b2e97c4ecbc2f24c9d3706d4cb5b3bf9e81a85f861c70b0
 MISC metadata.xml 460 BLAKE2B 488a43d888cbc4baa7d74bcf4b8852054037be8227f380d43f187baba239e253c2a0aa3ce1d8c2c672a4947be9e4268a2d1fa8adbb3db38fee9e2334851bc7eb SHA512 6e911380a7bc75a4f5726f4bb8f864a2660e93cb07be2cdf55b428fe8615e9e31c7a78f978064ed73fdc1133d6611b3bc3a39966439bb249e4f8a69dbae88f1c
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-2.0.2.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-2.0.2.ebuild
new file mode 100644
index 000000000000..0bf6c921ff5b
--- /dev/null
+++ b/net-analyzer/speedtest-cli/speedtest-cli-2.0.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command line interface for testing internet bandwidth using speedtest.net"
+HOMEPAGE="https://github.com/sivel/speedtest-cli"
+SRC_URI="https://github.com/sivel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+DOCS=( CONTRIBUTING.md README.rst )
+
+python_install_all() {
+	doman ${PN}.1
+	distutils-r1_python_install_all
+}
diff --git a/net-analyzer/w3af/Manifest b/net-analyzer/w3af/Manifest
index d0a6828b4bfe..cd2053b519f4 100644
--- a/net-analyzer/w3af/Manifest
+++ b/net-analyzer/w3af/Manifest
@@ -4,4 +4,4 @@ DIST w3af-1.1.tar.bz2 39994121 BLAKE2B e7f2fbb26360149dcffbd70b3cd2bb66a44019fc3
 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 515 BLAKE2B 29b4eeb263eb7934fce6cd3e8dc80a84e44923757f3f30d1d5734fae1524e8ba5c3b94124727633e9249d2d329ed75cebeb2b4e87cc11204d45e65d1920e14c5 SHA512 01a5e591fab2095f36570418ea556d385155c417dd94b2ed7a2a4c85897bc024bc139cbc3cfba55a0b76ea8c7973cadf867e183dffa426cf911c1af430d34f2a
+MISC metadata.xml 300 BLAKE2B d1a82226de14f9c975621325dd9136163f93c2158a3f7808b01479b46a8ee1fe405543138e60546e31cbc16456c8444ba91ed029f14ca3b8cb2d5d2ff31ed55f SHA512 2b9d8b958caf6e5e4cc4374aea404206220f55574a84b2865d0bda61bec24499f5033ad2381c4513c197195b68b4b949cd722112e5177f1e3112d93c9f388c60
diff --git a/net-analyzer/w3af/metadata.xml b/net-analyzer/w3af/metadata.xml
index 5f71099f5b98..573e0af10300 100644
--- a/net-analyzer/w3af/metadata.xml
+++ b/net-analyzer/w3af/metadata.xml
@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>clabbe.montjoie@gmail.com</email>
-		<name>LABBE Corentin (Montjoie)</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- 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/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 2492f9e43c41..2ebdc316e604 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -15,6 +15,6 @@ DIST wireshark-2.4.6.tar.xz 28851192 BLAKE2B 19a69d077b794ab07fbfb22b7cf9e61ff54
 DIST wireshark-2.6.1.tar.xz 28386244 BLAKE2B fe45f4249c81fd83ce35384b7038d7f1b5e21d884a5faec4344dda8f0c8b71393207e043672ce57bb6f1c45800ffce8feed8573a064db8048b3c0268feb0b486 SHA512 e68f7fa5975f10feccb76ab64c9a00f141cd04a12fa586a9839c93630d3554565d8e2ddfab83ec31cb813485b14b3227b7ec6e59baef007a6fe74b8b2a5ed444
 EBUILD wireshark-2.4.5.ebuild 7380 BLAKE2B 0fd3f07582d42cf9651496978c983c9cfa54b2ee0df52151c04bcb7ffd7c886aecf233598226dc2427ec0fbf6fa7d5d4ca8bf92f361c853a10b72dd625fa72dd SHA512 558350df39da8b7419d63251544900f519d920e120ffa40cdfefc7b088731d2ac6755928758bd4c9379f49b1b00b93f4cda8713601e340647d955cc73e6e590c
 EBUILD wireshark-2.4.6.ebuild 7388 BLAKE2B 1d73922229e3216ee9aeb3f95f964da3aa6afea193e88209df3f91419ba99de6de201538750dd79c3421bd8cf12dcfd1b12022b0be97a21f3e743fea17f70107 SHA512 dc66e5dd25527f9fd7ec05f6d810b4d92f2c138e2337def5571e7a7bcaf6034099ad649869190aa366700e6223e9de09997fa36c6910f9dbbc5e0c736e26a92b
-EBUILD wireshark-2.6.1.ebuild 6795 BLAKE2B ad6d4255e7957fb847563e3450ba3b2577fb3cd5c7a8f9e62ad6b4823e72297eb8f06a3638a06d2670bfde43a759b9022665cd14d24595789d911147f8e990c1 SHA512 9d4ccd80f395d28030529b0a3907e048047efd7f45759a981669d8a6d31bafae35bf3d59cfcb111e2c633e13afe0ffa22348c8c8da675b11f579948eb7f1f957
+EBUILD wireshark-2.6.1.ebuild 6626 BLAKE2B e577e69a7b9db97cb7f35374787d44abd53c5a0a02235f459a68b683ef8b669d3787332b00d5b57b62723c20ad04e0fb09c8ec2dbc30bf3e2a757edf8368fe8c SHA512 443adade8dede2f90531d65ebe34e90f3cec6fb29e2c5cdeb2764326b0509b08437a94532d979fca1270a8a9d0aa5734f2540bb936e38c785c004083eb8b2af3
 EBUILD wireshark-99999999.ebuild 6391 BLAKE2B a97356a1ffeafe735cad35e35d7633dc34c97239f7a0f47542da28d2912ca8eff0f9e5172d37efdc157d921026ddd6a92bb22d45b628cdecfdd485b0369552d4 SHA512 56818a23c3cd32a9553b4e7ca77ca21f99546a0a2bbab5fd8c3311d4c564c7e634fb19da5587609386ceb3c925150031b1c296753e89be68626b0f1e137903d8
 MISC metadata.xml 4787 BLAKE2B dcdb28c47094cfddc0effc4c16aa9132386f94d4d6e6cdb46f31a06ebb5dd7cd5c7bf967f50c6a002b7aeecddeb8aa8b86cb5961405a463c10389d6ec9b5cb7f SHA512 b683b159266bc37471ef26f6c0c4b2e94f72d2a77a2a7647e28b8b49e611973522af294c39050dbfa8aa5cca65bf2670f9d4c1e6a93d01b386e76f1ab75ff2e9
diff --git a/net-analyzer/wireshark/wireshark-2.6.1.ebuild b/net-analyzer/wireshark/wireshark-2.6.1.ebuild
index b9152684e6ed..efde4f468e86 100644
--- a/net-analyzer/wireshark/wireshark-2.6.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.6.1.ebuild
@@ -176,31 +176,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