gentoo resync : 04.08.2018

32 files changed, 412 insertions, 1072 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 6468203d73e8..273c8b02b76c 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/graphite-web/Manifest b/net-analyzer/graphite-web/Manifest
index 83cddef7a949..e16ca9d5d9af 100644
--- a/net-analyzer/graphite-web/Manifest
+++ b/net-analyzer/graphite-web/Manifest
@@ -1,9 +1,4 @@
-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 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 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-0.9.13-fhs-paths.patch b/net-analyzer/graphite-web/files/graphite-web-0.9.13-fhs-paths.patch
deleted file mode 100644
index ecfce96e0536..000000000000
--- a/net-analyzer/graphite-web/files/graphite-web-0.9.13-fhs-paths.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Install FHS-style paths
-
---- graphite-web-0.9.13/conf/graphite.wsgi.example
-+++ graphite-web-0.9.13/conf/graphite.wsgi.example
-@@ -1,5 +1,5 @@
- import os, sys
--sys.path.append('/opt/graphite/webapp')
-+sys.path.append('@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp')
- os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'graphite.settings')
- 
- import django
---- graphite-web-0.9.13/setup.py
-+++ graphite-web-0.9.13/setup.py
-@@ -59,7 +59,6 @@
-   ],
-   package_data={'graphite' :
-     ['templates/*', 'local_settings.py.example']},
--  scripts=glob('bin/*'),
--  data_files=webapp_content.items() + storage_dirs + conf_files + examples,
-+  data_files=webapp_content.items(),
-   **setup_kwargs
- )
---- graphite-web-0.9.13/webapp/graphite/local_settings.py.example
-+++ graphite-web-0.9.13/webapp/graphite/local_settings.py.example
-@@ -54,14 +54,14 @@
- #####################################
- # Change only GRAPHITE_ROOT if your install is merely shifted from /opt/graphite
- # to somewhere else
--#GRAPHITE_ROOT = '/opt/graphite'
-+GRAPHITE_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web'
- 
- # Most installs done outside of a separate tree such as /opt/graphite will only
- # need to change these three settings. Note that the default settings for each
- # of these is relative to GRAPHITE_ROOT
--#CONF_DIR = '/opt/graphite/conf'
--#STORAGE_DIR = '/opt/graphite/storage'
--#CONTENT_DIR = '/opt/graphite/webapp/content'
-+CONF_DIR = '@GENTOO_PORTAGE_EPREFIX@/etc/graphite-web'
-+STORAGE_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon'
-+CONTENT_DIR = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp/content'
- 
- # To further or fully customize the paths, modify the following. Note that the
- # default settings for each of these are relative to CONF_DIR and STORAGE_DIR
-@@ -69,6 +69,8 @@
- ## Webapp config files
- #DASHBOARD_CONF = '/opt/graphite/conf/dashboard.conf'
- #GRAPHTEMPLATES_CONF = '/opt/graphite/conf/graphTemplates.conf'
-+DASHBOARD_CONF = '@GENTOO_PORTAGE_EPREFIX@/etc/graphite-web/dashboard.conf'
-+GRAPHTEMPLATES_CONF = '@GENTOO_PORTAGE_EPREFIX@/etc/graphite-web/graphTemplates.conf'
- 
- ## Data directories
- # NOTE: If any directory is unreadable in DATA_DIRS it will break metric browsing
-@@ -77,7 +79,11 @@
- #DATA_DIRS = [WHISPER_DIR, RRD_DIR] # Default: set from the above variables
- #LOG_DIR = '/opt/graphite/storage/log/webapp'
- #INDEX_FILE = '/opt/graphite/storage/index'  # Search index file
--
-+WHISPER_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/whisper'
-+RRD_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/rrd'
-+DATA_DIRS = [WHISPER_DIR, RRD_DIR] # Default: set from the above variables
-+LOG_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/log/graphite-web/'
-+INDEX_FILE = '@GENTOO_PORTAGE_EPREFIX@/var/lib/graphite-web/index'  # Search index file
- 
- #####################################
- # Email Configuration #
---- graphite-web-0.9.13/webapp/graphite/manage.py
-+++ graphite-web-0.9.13/webapp/graphite/manage.py
-@@ -6,7 +6,7 @@
- 
- 
- if __name__ == "__main__":
--    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
-+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "graphite.settings")
- 
-     from django.core.management import execute_from_command_line
- 
diff --git a/net-analyzer/graphite-web/files/graphite-web-0.9.13-system-libs.patch b/net-analyzer/graphite-web/files/graphite-web-0.9.13-system-libs.patch
deleted file mode 100644
index be5bbb9ab761..000000000000
--- a/net-analyzer/graphite-web/files/graphite-web-0.9.13-system-libs.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 1ca73dd4ec442d6ada765e5375efee84bbc7522b Mon Sep 17 00:00:00 2001
-From: Jamie Nguyen <j@jamielinux.com>
-Date: Mon, 29 Sep 2014 09:53:22 +0100
-Subject: [PATCH] Force use of system libraries
-
----
- setup.py                          | 2 --
- webapp/graphite/cli/parser.py     | 2 +-
- webapp/graphite/render/attime.py  | 5 +----
- webapp/graphite/render/glyph.py   | 5 +----
- webapp/graphite/render/grammar.py | 2 +-
- webapp/graphite/render/views.py   | 5 +----
- 6 files changed, 5 insertions(+), 16 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 4dc0ce0..1b910d1 100644
---- a/setup.py
-+++ b/setup.py
-@@ -54,8 +54,6 @@ setup(
-     'graphite.graphlot',
-     'graphite.events',
-     'graphite.version',
--    'graphite.thirdparty',
--    'graphite.thirdparty.pytz',
-   ],
-   package_data={'graphite' :
-     ['templates/*', 'local_settings.py.example']},
-diff --git a/webapp/graphite/cli/parser.py b/webapp/graphite/cli/parser.py
-index ec1a435..7d7d48d 100644
---- a/webapp/graphite/cli/parser.py
-+++ b/webapp/graphite/cli/parser.py
-@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License."""
- 
--from graphite.thirdparty.pyparsing import *
-+from pyparsing import *
- 
- grammar = Forward()
- 
-diff --git a/webapp/graphite/render/attime.py b/webapp/graphite/render/attime.py
-index 55a644c..8adde3f 100644
---- a/webapp/graphite/render/attime.py
-+++ b/webapp/graphite/render/attime.py
-@@ -16,10 +16,7 @@ from datetime import datetime,timedelta
- from time import daylight
- from django.conf import settings
- 
--try: # See if there is a system installation of pytz first
--  import pytz
--except ImportError: # Otherwise we fall back to Graphite's bundled version
--  from graphite.thirdparty import pytz
-+import pytz
- 
- 
- months = ['jan','feb','mar','apr','may','jun','jul','aug','sep','oct','nov','dec']
-diff --git a/webapp/graphite/render/glyph.py b/webapp/graphite/render/glyph.py
-index a2cc893..c6f31f1 100644
---- a/webapp/graphite/render/glyph.py
-+++ b/webapp/graphite/render/glyph.py
-@@ -22,10 +22,7 @@ from graphite.render.datalib import TimeSeries
- from graphite.util import json
- 
- 
--try: # See if there is a system installation of pytz first
--  import pytz
--except ImportError: # Otherwise we fall back to Graphite's bundled version
--  from graphite.thirdparty import pytz
-+import pytz
- 
- INFINITY = float('inf')
- 
-diff --git a/webapp/graphite/render/grammar.py b/webapp/graphite/render/grammar.py
-index 07e3e4b..2b0ba41 100644
---- a/webapp/graphite/render/grammar.py
-+++ b/webapp/graphite/render/grammar.py
-@@ -1,4 +1,4 @@
--from graphite.thirdparty.pyparsing import *
-+from pyparsing import *
- 
- ParserElement.enablePackrat()
- grammar = Forward()
-diff --git a/webapp/graphite/render/views.py b/webapp/graphite/render/views.py
-index 186232e..cd747a7 100644
---- a/webapp/graphite/render/views.py
-+++ b/webapp/graphite/render/views.py
-@@ -25,10 +25,7 @@ try:
- except ImportError:
-   import pickle
- 
--try:  # See if there is a system installation of pytz first
--  import pytz
--except ImportError:  # Otherwise we fall back to Graphite's bundled version
--  from graphite.thirdparty import pytz
-+import pytz
- 
- from graphite.util import getProfileByUsername, json, unpickle
- from graphite.remote_storage import HTTPConnectionWithTimeout
--- 
-1.9.3
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
deleted file mode 100644
index f0fed573df9f..000000000000
--- a/net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 python-utils-r1 prefix
-
-DESCRIPTION="Enterprise scalable realtime graphing"
-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"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+carbon ldap mysql memcached postgres +sqlite"
-
-DEPEND=""
-RDEPEND="
-	dev-lang/python[sqlite?]
-	sqlite? ( >=dev-python/django-1.4[sqlite?,${PYTHON_USEDEP}] )
-	mysql? ( >=dev-python/django-1.4[${PYTHON_USEDEP}]
-		|| (
-			dev-python/mysql-python[${PYTHON_USEDEP}]
-			dev-python/mysqlclient[${PYTHON_USEDEP}]
-		)
-	)
-	postgres? (
-		>=dev-python/django-1.4[${PYTHON_USEDEP}]
-		dev-python/psycopg:2[${PYTHON_USEDEP}]
-	)
-	>=dev-python/twisted-core-10.0[${PYTHON_USEDEP}]
-	>=dev-python/django-tagging-0.3.1[${PYTHON_USEDEP}]
-	<dev-python/django-1.9[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/txAMQP[${PYTHON_USEDEP}]
-	carbon? ( dev-python/carbon[${PYTHON_USEDEP}] )
-	dev-python/whisper[${PYTHON_USEDEP}]
-	media-libs/fontconfig
-	memcached? ( dev-python/python-memcached[${PYTHON_USEDEP}] )
-	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	# Do not install the configuration and data files. We install them
-	# somewhere sensible by hand.
-	"${FILESDIR}"/${P}-fhs-paths.patch
-	"${FILESDIR}"/${P}-system-libs.patch
-)
-
-EXAMPLES=(
-	examples/example-graphite-vhost.conf
-	conf/dashboard.conf.example
-	conf/graphite.wsgi.example
-)
-
-src_prepare() {
-	# use FHS-style paths
-	rm setup.cfg || die
-	# 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
-	dodir /usr/bin
-	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
-
-	# shortener image isn't included for some reason
-	cp "${DISTDIR}"/"${P}"-share.png "${ED}"/usr/share/${PN}/webapp/content/img/
-
-	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
-}
-
-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/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 90cbc934174c..966bfad292c3 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,7 +1,10 @@
 AUX icinga2.initd 2276 BLAKE2B 9573c876cb1fc6ff641d4503d5446840725d94ac2a824cd124872af84032519a5ee1237b0ebc38783e673cb87169feb48b7690978e9b7d2e38549a7272f403fc SHA512 5b31f748eda8f52d8efe2c744c3c1adacffdb40c04d93cdaf7ee82129d632783362f6ea51b5a4c05ca9cd98d3343abfcfc86c98e99afd429d6bce390b9ffd082
+AUX icinga2.initd-2 2682 BLAKE2B 613fdb4fdcef7c95bba710c5fcb6ee84dcb3cd739bf0caa42130e2d1a4faf7341d82447bbac6070567581b90beba261302e8d03c148876db157c68054f64e233 SHA512 1ca1001e6095b17d57cd7ff70a2cc302f6dfa466cbe0a71154dd188caabd31e4b69821a3d8383ed855dcb2d2c396b2141a70de298a6f3c40ab79993c292fa6cb
 DIST icinga2-2.8.4.tar.gz 2510333 BLAKE2B f551a5eadc93d8455612af40e34a0922bc75f41b8064f9989c8f0c28dc2c3fb18963cf9b3272efa29f03973e7cf5824762bebff1bfa1a23c4ba39c93fc29c8e5 SHA512 b2cb5989962ac65da927cbdbac1b3345c913321d507b5113f32dd90bf969b2513478e68d52b9cd4cf255057d74428f9e42067288b7ddc59ad060ca7b84f4f114
 DIST icinga2-2.9.0.tar.gz 2192684 BLAKE2B b27da06a8b1d70108c792ccbef67a8082b7bb1ec9326ffdcd56406e8bf00e00fa7ef7cbedae803835cc7576bfb1db07cac4e6d1c8338d67e0ff071b821a661ea SHA512 e95f29f9a7e2ba9ad2ca16972fad23a9d18ee0470fbfd70f0bbc8efba9cdcce77d7c5abd2fca98e7b30c64f0014f89f9edd494473769efa6a6e01c08ebdcc1a4
+DIST icinga2-2.9.1.tar.gz 2193190 BLAKE2B 29be491c4b43e218ef8aaa2128822040ccb0989e91d83f033cf7873216e4307cdbc8ee9052d79fd22220c396efeb68759acc97938e3ee596e0820e3f6c8f73bc SHA512 1d69a24f85249386e30ff1625cf522ba58e5f2ab641dbe950bf1764324a6c7516d1532942954e842002566823b0f30383747d5ec8b7bd36705aa5f0ccfa29533
 EBUILD icinga2-2.8.4.ebuild 4604 BLAKE2B 074505319ffdb68d93df79dbfe6c2a88a971b1a188e28526dd97e131d7494e6076173cbe9b8ee3599c7deecb62610f23828f0c107460555d47394d29f81eedbe SHA512 be570d2178c8750227b1dfb46c682a1805696fe9b46241f6ef9f59fa1e6ac9886d7e88cc14bcd5e094cd3671f49dfa1ad91046d3e08288b8266f888fde37a2a1
-EBUILD icinga2-2.9.0.ebuild 4432 BLAKE2B 2a5f9a690609af8d683c98bfe2e4f53026b8ce261bf91e2585781a51994bb515e5ce86624923c908d2fd8f9ef11c3fd68a88f9e0de42a3cafe0cda51ff5ef2db SHA512 f7cffee062c8830c32f9888b026b39de2924cb4d7c017404a6db3567b561191f07ae5d4250bcd3edd5e13c3e60fc5b2d62994a656ea7a2e5da6506b1da9f77b0
-EBUILD icinga2-9999.ebuild 4432 BLAKE2B 2a5f9a690609af8d683c98bfe2e4f53026b8ce261bf91e2585781a51994bb515e5ce86624923c908d2fd8f9ef11c3fd68a88f9e0de42a3cafe0cda51ff5ef2db SHA512 f7cffee062c8830c32f9888b026b39de2924cb4d7c017404a6db3567b561191f07ae5d4250bcd3edd5e13c3e60fc5b2d62994a656ea7a2e5da6506b1da9f77b0
+EBUILD icinga2-2.9.0-r1.ebuild 4434 BLAKE2B b8aa58e62d287d3a588214a19f3b54ba78e05f19804076cc60bfbf64b08c66aea546673c10afc4bd41cf9974c37053d5aeab2fbb9ca3a309fdcc68f6b1347da2 SHA512 5ba0a5744cd050183ce0967d4b8707db52333bc1bd0595344b27ccd1327503860114fa26fd71917d2bb501c0cd03caae8febfb3e00f6b67db637f1fe952903a7
+EBUILD icinga2-2.9.1.ebuild 4434 BLAKE2B b8aa58e62d287d3a588214a19f3b54ba78e05f19804076cc60bfbf64b08c66aea546673c10afc4bd41cf9974c37053d5aeab2fbb9ca3a309fdcc68f6b1347da2 SHA512 5ba0a5744cd050183ce0967d4b8707db52333bc1bd0595344b27ccd1327503860114fa26fd71917d2bb501c0cd03caae8febfb3e00f6b67db637f1fe952903a7
+EBUILD icinga2-9999.ebuild 4434 BLAKE2B b8aa58e62d287d3a588214a19f3b54ba78e05f19804076cc60bfbf64b08c66aea546673c10afc4bd41cf9974c37053d5aeab2fbb9ca3a309fdcc68f6b1347da2 SHA512 5ba0a5744cd050183ce0967d4b8707db52333bc1bd0595344b27ccd1327503860114fa26fd71917d2bb501c0cd03caae8febfb3e00f6b67db637f1fe952903a7
 MISC metadata.xml 816 BLAKE2B 6d820358c90a580be01149ae631f40dbeb5f50ce0df937ac484269c9a58f21a450d3861dce3b34ee0882b3b61d981da8162af735c5a3de90bb7b74dae9523d08 SHA512 0d3ac2d9233f7ce53a8105caed0231cefa402861e26c760de3fb23163ea68c21b97f5ec0de65bc6953aaf2dd8fa90a9edc045a2fea8b622efdd1336959e9e60b
diff --git a/net-analyzer/icinga2/files/icinga2.initd-2 b/net-analyzer/icinga2/files/icinga2.initd-2
new file mode 100644
index 000000000000..b12716d4d446
--- /dev/null
+++ b/net-analyzer/icinga2/files/icinga2.initd-2
@@ -0,0 +1,91 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload"
+
+# Set defaults, see /etc/conf.d/icinga2 to override
+: ${DAEMON:=/usr/sbin/icinga2}
+: ${ICINGA2_CONFIG_FILE:=/etc/icinga2/icinga2.conf}
+: ${ICINGA2_RUN_DIR:=/run/icinga2}
+: ${ICINGA2_STATE_DIR:=/var/cache/icinga2}
+: ${ICINGA2_PID_FILE:=${ICINGA2_RUN_DIR}/icinga2.pid}
+: ${ICINGA2_CMD_DIR:=${ICINGA2_RUN_DIR}/cmd}
+: ${ICINGA2_LOG_DIR:=/var/log/icinga2}
+: ${ICINGA2_ERROR_LOG:=/var/log/icinga2/error.log}
+: ${ICINGA2_STARTUP_LOG:=/var/log/icinga2/startup.log}
+: ${ICINGA2_LOG:=/var/log/icinga2/icinga2.log}
+: ${ICINGA2_CACHE_DIR:=/var/cache/icinga2}
+: ${ICINGA2_USER:=icinga}
+: ${ICINGA2_GROUP:=icingacmd}
+: ${ICINGA2_COMMAND_GROUP:=icingacmd}
+
+ICINGA2_DAEMON_ARGS="daemon -c $ICINGA2_CONFIG_FILE -e $ICINGA2_ERROR_LOG -d"
+
+depend() {
+    need net
+}
+
+checkconfig() {
+    if [ ! -e "$ICINGA2_CONFIG_FILE" ]; then
+       ewarn "Config file '$ICINGA2_CONFIG_FILE' does not exist."
+       eend 1
+    fi
+
+    ICINGA2_USER=$($DAEMON variable get --current RunAsUser)
+    if [ $? != 0 ]; then
+        eerror "Could not fetch RunAsUser variable: '$ICINGA2_USER'."
+        return 1
+    fi
+    ICINGA2_GROUP=$($DAEMON variable get --current RunAsGroup)
+    if [ $? != 0 ]; then
+        eerror "Could not fetch RunAsGroup variable: '$ICINGA2_GROUP'."
+        return 1
+    fi
+
+    checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_RUN_DIR
+    checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_STATE_DIR
+    checkpath -d -m 2750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_CMD_DIR
+
+    if ! $DAEMON daemon -c $ICINGA2_CONFIG_FILE -C > $ICINGA2_STARTUP_LOG 2>&1; then
+        eerror "Icinga2 detected configuration errors. Check '$ICINGA2_STARTUP_LOG' for details."
+        return 1
+    fi
+}
+
+start() {
+    checkconfig || return 1
+
+    ebegin "Starting icinga2"
+    start-stop-daemon --start --exec "${DAEMON}" \
+        --pidfile "${ICINGA2_PID_FILE}" \
+        -- $ICINGA2_DAEMON_ARGS > $ICINGA2_STARTUP_LOG 2>&1
+    local retval=$?
+    if [ $retval -ne 0 ]; then
+        ewarn "Error starting icinga2. '$ICINGA2_STARTUP_LOG' for details."
+    fi
+    eend $retval
+}
+
+stop() {
+    ebegin "Stopping icinga2"
+    start-stop-daemon \
+        --stop \
+        --pidfile $ICINGA2_PID_FILE \
+        --retry "SIGTERM/15 SIGKILL/30" \
+        --progress
+    eend $?
+}
+
+reload() {
+    checkconfig || return 1
+
+    ebegin "Reloading icinga2"
+    start-stop-daemon --signal HUP --pidfile "$ICINGA2_PID_FILE"
+
+    local retval=$?
+    if [ $retval -ne 0 ]; then
+        ewarn "Error reloading icinga2."
+    fi
+    eend $retval
+}
diff --git a/net-analyzer/icinga2/icinga2-2.9.0.ebuild b/net-analyzer/icinga2/icinga2-2.9.0-r1.ebuild
index 3085070c612b..5911a0414050 100644
--- a/net-analyzer/icinga2/icinga2-2.9.0.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.9.0-r1.ebuild
@@ -107,7 +107,7 @@ src_install() {
 
 	einstalldocs
 
-	newinitd "${FILESDIR}"/icinga2.initd icinga2
+	newinitd "${FILESDIR}"/icinga2.initd-2 icinga2
 
 	if use mysql ; then
 		docinto schema
diff --git a/net-analyzer/icinga2/icinga2-2.9.1.ebuild b/net-analyzer/icinga2/icinga2-2.9.1.ebuild
new file mode 100644
index 000000000000..5911a0414050
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.9.1.ebuild
@@ -0,0 +1,163 @@
+# 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:= )"
+
+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.
+		http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2"
+	fi
+}
diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index 3085070c612b..5911a0414050 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild
@@ -107,7 +107,7 @@ src_install() {
 
 	einstalldocs
 
-	newinitd "${FILESDIR}"/icinga2.initd icinga2
+	newinitd "${FILESDIR}"/icinga2.initd-2 icinga2
 
 	if use mysql ; then
 		docinto schema
diff --git a/net-analyzer/labrea/Manifest b/net-analyzer/labrea/Manifest
index 1a93e5af26d1..586ca3a3ec25 100644
--- a/net-analyzer/labrea/Manifest
+++ b/net-analyzer/labrea/Manifest
@@ -1,4 +1,6 @@
+AUX labrea-2.5-pcap_open.patch 1115 BLAKE2B ba279ea65a905df62a9886ba5db86fb7696d88bfee1309f01ab8b0515809ec88706325e7486bcc3d8b7b6c32d29a1b0270420eaacfe6c825a1e96f65f8780c78 SHA512 336d06bc3db06d19b48a1c5c6b5bc9da31aef6d0103de3c711563e6cb74c650480bf2bfb4606686bc0030140ced2ffd54ad36f24a9bce06bad43d94c33906335
 AUX labrea-2.5-stable-1-incdir.patch 218 BLAKE2B c0b795e5c2010b733522873c8e78ce12551fd8009a51b32af01dfca64202f7ecd22f13935ae84de3ee7ac3949ffafd060cba69503d19726aea51524cccc4984e SHA512 935a9e0a884d8b1c7ae30c24c59c3f30d0491bde45329fe00f0f64e854d9c686b22f002dce832d5dbb17a45e23a0a3e3aae64f1150edc349c8b3499bd8bcadd1
 DIST labrea-2.5-stable-1.tar.gz 210494 BLAKE2B 3db2f4c014c578446fd9d6303f8c17245d3d9a7e8e481bf64195693f21eb30b9e0e2d6cf59ae124982e358d4aad2d22654ee46544957ab783f33a13c951d6a3d SHA512 63523f59e9e6ca31d2a5ea781f7b7087e7e41835aec24cd8cbf1cf7b65893fb1cedb2b13aa5fcfab458375ef27f5521a9ab88a71734b7317edf8eda2746c566c
 EBUILD labrea-2.5-r2.ebuild 797 BLAKE2B e951f243097015fd039e03711f83346cd65b57b9d9b1ea799df0182093b34581c6c0f75eca3833eaa87826a59eb5330a18a924c6164e00515e07d53faef28062 SHA512 e2d5cdf2c81b941f62c54832a8f2b03774540474491694b243581693fa61391174c14ce2947d4cfa7d95e1450a8d7ab075ab26001f96f6b5d5518cd4db10afd1
+EBUILD labrea-2.5-r3.ebuild 845 BLAKE2B d4a799401c9aac57385191dfef319bf17a92dd836db1bd10266d0b902e41c7dbeb7f7781482f6885d84dd84998e9602d349a96017bfd77675f409e465cf3c2ab SHA512 9c0f79e5552afb66cf0900582f4cf0dbe2c61a331dc0a9e563628e0ebb415f6d03c4de285c3dfcdbba01fedb61cdd7837ce2d25bc06aa24bdecfbc4f2250413c
 MISC metadata.xml 418 BLAKE2B 35f9257137d58b11fea67208a23b4ae0605c4f827c65db13b132c1d6aa2842470eff8e1e77a23c19f98755db697dbeee7df6501b8e7d995981dc6369cc2d4a7d SHA512 b099ece62d6f338e2ba3b8c3c653833252a6cd34d4f9bd0efd227cf6a0c2aedddd6c241c557ce3e05e56bfb9e99923228556d7b28ad26f641872d7ef1fd2acd9
diff --git a/net-analyzer/labrea/files/labrea-2.5-pcap_open.patch b/net-analyzer/labrea/files/labrea-2.5-pcap_open.patch
new file mode 100644
index 000000000000..7c918dfa15f3
--- /dev/null
+++ b/net-analyzer/labrea/files/labrea-2.5-pcap_open.patch
@@ -0,0 +1,42 @@
+--- a/src/pcaputil.c
++++ b/src/pcaputil.c
+@@ -52,7 +52,7 @@
+ #include "pcaputil.h"
+ 
+ pcap_t *
+-pcap_open(char *device)
++labrea_pcap_open(char *device)
+ {
+ 	char ebuf[PCAP_ERRBUF_SIZE];
+ 	pcap_t *pcap;
+--- a/src/lbio.c
++++ b/src/lbio.c
+@@ -190,7 +190,7 @@
+   /*
+    * Open the WinPcap device for sniffing
+    */
+-  if ((io.pcap = pcap_open(io.adapter_name_list[j])) == NULL) {
++  if ((io.pcap = labrea_pcap_open(io.adapter_name_list[j])) == NULL) {
+     warnx("*** Couldn't open WinPcap adapter" );
+     return(-1);
+   }
+@@ -286,7 +286,7 @@
+       util_clean_exit(1);
+ 
+   } else { /* open Unix pcap device for sniffing */
+-    if ((io.pcap = pcap_open(io.ifent->intf_name)) == NULL) {
++    if ((io.pcap = labrea_pcap_open(io.ifent->intf_name)) == NULL) {
+       warnx("*** Couldn't open pcap device for sniffing" );
+       util_clean_exit(1);
+     }
+--- a/inc/pcaputil.h
++++ b/inc/pcaputil.h
+@@ -15,7 +15,7 @@
+ #endif
+ 
+ 
+-pcap_t * pcap_open(char *device);
++pcap_t * labrea_pcap_open(char *device);
+ int	pcap_dloff(pcap_t *pcap);
+ int	pcap_filter(pcap_t *pcap, const char *fmt, ...);
+ void	pcap_stat (pcap_t *pd);
diff --git a/net-analyzer/labrea/labrea-2.5-r3.ebuild b/net-analyzer/labrea/labrea-2.5-r3.ebuild
new file mode 100644
index 000000000000..1d43736622c7
--- /dev/null
+++ b/net-analyzer/labrea/labrea-2.5-r3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="'Sticky' Honeypot and IDS"
+HOMEPAGE="http://labrea.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-stable-1.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="
+	net-libs/libpcap
+	>=dev-libs/libdnet-1.7
+"
+RDEPEND="
+	${DEPEND}
+"
+
+MY_P="${P}-stable-1"
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS ChangeLog README TODO NEWS )
+PATCHES=(
+	"${FILESDIR}"/${P}-stable-1-incdir.patch
+	"${FILESDIR}"/${P}-pcap_open.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	newdoc INSTALL README.first
+}
+
+pkg_postinst() {
+	ewarn "Before using this package READ the INSTALL and README"
+	ewarn "as the author states that it can cause serious problems on your network"
+}
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index e34c69b4049a..54f1965b3ecc 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,9 +1,4 @@
-AUX netdata-1.8.0-openrc-fixes.patch 3618 BLAKE2B 1de1767c3d2c3cf7d13ced971d3185d454415bdd518f10ac0a30ab18a830d597536f029d6a8cd8c24a344df91a33833b56318860a99d845fe5e7f887469fac34 SHA512 9ba1da7f5a75b99249abe997a54fbd0ec69ef8ad2291d656c739f580c9758c7133224f09462ce001719cc06a7017a1745722977bef91c4e45bdb455377e39069
 DIST netdata-1.10.0.tar.gz 2611773 BLAKE2B ffc4bfa593e4a36785c7e09709f1063598bd337016ad858e435049c5821f44fd5f048e4e7874e06d67c7e59234f6ec67a8a50fc7573f6b2f0cd768770ee2a612 SHA512 2358db818ad7d1ef6298c25d3f9d6c5a5a850f5bbe033b82cca1f3bc154055523637691417b6f2c2d4b7273b575afa0ec13e203ea7c2dd6321088a078ef05017
-DIST netdata-1.8.0.tar.gz 2779648 BLAKE2B 537d39c3f24ec53fbc7156663cf842143c560b8f8b40647d68e3ad0772bea441a70c7550da213bb0c5d75e0a0d685f32388f95f36e1e1101a0d619f44523c9f4 SHA512 8bb21f49ce1fcf3d199eabd18f65d5005ef784b227f08cd8efe91e5cab2ae980cf0aea4bcaa3aca1dc666c10845684deca48257510ad574bd948ecd019afcdaf
-DIST netdata-1.9.0.tar.gz 2483847 BLAKE2B 7f1bcc9cc5768a91b39c39cac04f877472d008630dfa3da97c0893c3cceeed721fb2982fce1f377267cf76e2a9ea70cca650d53bdd442e944820b0356f2700ea SHA512 d17112e2222e48a7d06704d03598e6020b6172f93a6f19e5577657fc5ffe902b8a0472f53b880552eb653e855da3e743a863db446520af008d3b75fb1b438e90
-EBUILD netdata-1.10.0.ebuild 2462 BLAKE2B 8e76db0cf2969add5fbf205c6c73b4c825b3edb0c1aa26fd710a6df97fe163b07553594aea140e2ed1eca369e358807f339eafd43ffc0a2113bf83914abcb889 SHA512 874c186f314f1ba6edf599700c4af0eb047fcce4bcb515b56cbabd7088179492cafa4374ca6ff317afde6a62a8331453a79e42b068e1c64201d0d49c16220711
-EBUILD netdata-1.8.0-r1.ebuild 2512 BLAKE2B de6d953a4f910a9fd25a89218db797fd62768ff99ab97826d337b34d2be784eb6e97a4b5cc4e369871ea18c054c89ba381019d4daf05a5aabf9b28a606a3ed71 SHA512 b0c67391956880bf60e6ec9caeb1addb8029cc676dad69762d90c65a974f3fa6fe847f55b8b7c85739f03759fbaae64216cec31cf8130fbbedb85b23669ae062
-EBUILD netdata-1.9.0.ebuild 2462 BLAKE2B 2b84381b701bbc729db9567aa3debcb0ca6dadaa312129a5fc19cb0005b8839889b7d3c90c46a1f06df541a61ee0e1b58b0ce74a8c2ddb6aa9bcfeb217b876ee SHA512 8925ef75c6c54588bf4ee97e42f71c0e24f3baad2aec58585b0e789b0fcace1185ba727fb800cdeb5cd109e76139b7cf1c1fe6a9a10d0c90baca52479e23fa8f
-EBUILD netdata-9999.ebuild 2462 BLAKE2B 2b84381b701bbc729db9567aa3debcb0ca6dadaa312129a5fc19cb0005b8839889b7d3c90c46a1f06df541a61ee0e1b58b0ce74a8c2ddb6aa9bcfeb217b876ee SHA512 8925ef75c6c54588bf4ee97e42f71c0e24f3baad2aec58585b0e789b0fcace1185ba727fb800cdeb5cd109e76139b7cf1c1fe6a9a10d0c90baca52479e23fa8f
+EBUILD netdata-1.10.0-r1.ebuild 2541 BLAKE2B 70123767be2cbdf1d90dcb05a44a7c34cee223ce00a2b9aa803d5e8c242a638f05be593c4ad382ecc93fb5cc7db443984ae1777adf032da40ca336b4ae4d07ca SHA512 531ceafb0dc2b8988a5af2c1c3c42298bb009d5ae022619cee1940c67fa7b117f5b5fb495ac02adfad61e93729db5908e1b869c114130835d5027fe519faddba
+EBUILD netdata-9999.ebuild 2541 BLAKE2B 70123767be2cbdf1d90dcb05a44a7c34cee223ce00a2b9aa803d5e8c242a638f05be593c4ad382ecc93fb5cc7db443984ae1777adf032da40ca336b4ae4d07ca SHA512 531ceafb0dc2b8988a5af2c1c3c42298bb009d5ae022619cee1940c67fa7b117f5b5fb495ac02adfad61e93729db5908e1b869c114130835d5027fe519faddba
 MISC metadata.xml 807 BLAKE2B fa551c2d00268159e7bbd6e3c4a37d29a68ce7ceb1d5390a8e55571c24046f74fa1f464b8a9dd54fac2aaf7a71289e2ce05e006e2de904262f0cc283dc9d4c27 SHA512 bc6d35a5d9f28c8bf6fc9ccee126f4db6c22c915ee75c45ff0e898e712f8a7277f3d6fb22024a76d624e34609dbab9a36cfff696626eec9de84fadd361d8410d
diff --git a/net-analyzer/netdata/files/netdata-1.8.0-openrc-fixes.patch b/net-analyzer/netdata/files/netdata-1.8.0-openrc-fixes.patch
deleted file mode 100644
index 517eaec51faf..000000000000
--- a/net-analyzer/netdata/files/netdata-1.8.0-openrc-fixes.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 3f4db620484e777265a7e5f0cfe10ba840f7eefd Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Tue, 3 Oct 2017 10:52:02 -0400
-Subject: [PATCH 1/3] Eliminate bashisms in openrc script
-
----
- system/netdata-openrc.in | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/system/netdata-openrc.in b/system/netdata-openrc.in
-index 465e1232c..5c4eafa57 100644
---- a/system/netdata-openrc.in
-+++ b/system/netdata-openrc.in
-@@ -38,13 +38,13 @@ depend() {
- }
- 
- start_post() {
--	if [[ ! -f @sysconfdir_POST@/netdata/netdata.conf ]]; then
-+	if [ ! -f @sysconfdir_POST@/netdata/netdata.conf ]; then
- 		ebegin "Downloading default configuration to @sysconfdir_POST@/netdata/netdata.conf"
- 		sleep 2
- 		curl -s -o @sysconfdir_POST@/netdata/netdata.conf.new "${NETDATA_CONFIG_URL}"
- 		ret=$?
--		if [[ $ret -eq 0 && -s @sysconfdir_POST@/netdata/netdata.conf.new ]]; then
--			mv @sysconfdir_POST@/netdata/netdata.conf{.new,}
-+		if [ $ret -eq 0 && -s @sysconfdir_POST@/netdata/netdata.conf.new ]; then
-+			mv @sysconfdir_POST@/netdata/netdata.conf.new @sysconfdir_POST@/netdata/netdata.conf
- 		else
- 			ret=1
- 			rm @sysconfdir_POST@/netdata/netdata.conf.new 2>/dev/null
-@@ -57,20 +57,20 @@ stop_post() {
- 	local result ret=0 count=0 sigkill=0
- 
- 	ebegin "Waiting for netdata to save its database"
--	while [[ -f "${pidfile}" ]]; do
--		if [[ $count -gt ${NETDATA_WAIT_EXIT_TIMEOUT} ]]; then
-+	while [ -f "${pidfile}" ]; do
-+		if [ $count -gt ${NETDATA_WAIT_EXIT_TIMEOUT} ]; then
- 			sigkill=1
- 			break
- 		fi
- 
--		count=$[count + 1]
-+		count=$((count + 1))
- 		kill -0 $(cat ${pidfile}) 2>/dev/null
- 		ret=$?
- 		test $ret -eq 0 && sleep 1
- 	done
- 	eend $sigkill
- 
--	if [[ $sigkill -eq 1 && -f "${pidfile}" ]]; then
-+	if [ $sigkill -eq 1 && -f "${pidfile}" ]; then
- 		ebegin "Netdata is taking too long to exit, forcing it to quit"
- 		kill -SIGKILL $(cat ${pidfile}) 2>/dev/null
- 		eend $?
-
-From b6d80fb3a3ae60077cbbc1e8dd0d01e1eb3ff67d Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Tue, 3 Oct 2017 14:56:53 -0400
-Subject: [PATCH 2/3] Fix the path to the netdata executable in the openrc
- script
-
-Fixes #2826
----
- system/netdata-openrc.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/system/netdata-openrc.in b/system/netdata-openrc.in
-index 5c4eafa57..512d48278 100644
---- a/system/netdata-openrc.in
-+++ b/system/netdata-openrc.in
-@@ -23,7 +23,7 @@
- 
- extra_started_commands="getconf"
- pidfile="/run/netdata.pid"
--command="${NETDATA_INSTALL_PATH}/usr/sbin/netdata"
-+command="@sbindir_POST@/netdata"
- command_background="yes"
- command_args="-P ${pidfile} ${NETDATA_EXTRA_ARGS}"
- # start_stop_daemon_args="-u ${NETDATA_OWNER}"
-
-From b5823e7865851c3cc2381c4fb45716f269a4e85f Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Tue, 3 Oct 2017 15:56:39 -0400
-Subject: [PATCH 3/3] Create the var/cache/netdata directory if it doesn't
- already exist in the systemd script
-
----
- system/netdata.service.in | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/system/netdata.service.in b/system/netdata.service.in
-index 1d4af988a..58cdff225 100644
---- a/system/netdata.service.in
-+++ b/system/netdata.service.in
-@@ -9,6 +9,9 @@ Group=netdata
- RuntimeDirectory=netdata
- RuntimeDirectoryMode=0775
- ExecStart=@sbindir_POST@/netdata -P /run/netdata/netdata.pid -D
-+ExecStartPre=/bin/mkdir -p @localstatedir_POST@/cache/netdata
-+ExecStartPre=/bin/chown -R netdata:netdata @localstatedir_POST@/cache/netdata
-+PermissionsStartOnly=true
- 
- # saving a big db on slow disks may need some time
- TimeoutStopSec=60
diff --git a/net-analyzer/netdata/netdata-1.10.0.ebuild b/net-analyzer/netdata/netdata-1.10.0-r1.ebuild
index 5bde37d06a89..d22fa18925fe 100644
--- a/net-analyzer/netdata/netdata-1.10.0.ebuild
+++ b/net-analyzer/netdata/netdata-1.10.0-r1.ebuild
@@ -90,13 +90,16 @@ src_configure() {
 src_install() {
 	default
 
-	rm -rf "${D}/var/cache/netdata" || die
+	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}
 
diff --git a/net-analyzer/netdata/netdata-1.8.0-r1.ebuild b/net-analyzer/netdata/netdata-1.8.0-r1.ebuild
deleted file mode 100644
index d23f3237e7b5..000000000000
--- a/net-analyzer/netdata/netdata-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2017 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 autotools fcaps linux-info python-r1 systemd user
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/firehol/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/firehol/${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/firehol/netdata https://my-netdata.io/"
-PATCHES=( "${FILESDIR}/${P}-openrc-fixes.patch" )
-
-LICENSE="GPL-3+ MIT BSD"
-SLOT="0"
-IUSE="caps +compression cpu_flags_x86_sse2 ipmi mysql nfacct nodejs postgres +python"
-REQUIRED_USE="
-	mysql? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-# most unconditional dependencies are for plugins.d/charts.d.plugin:
-RDEPEND="
-	>=app-shells/bash-4:0
-	|| (
-		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}] )
-	)"
-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/netdata" || die
-
-	# Remove unneeded .keep files
-	find "${ED}" -name ".keep" -delete || die
-
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
-
-	fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
-
-	newinitd system/netdata-openrc ${PN}
-	systemd_dounit system/netdata.service
-	insinto /etc/netdata
-	doins system/netdata.conf
-}
diff --git a/net-analyzer/netdata/netdata-1.9.0.ebuild b/net-analyzer/netdata/netdata-1.9.0.ebuild
deleted file mode 100644
index 7c343955b897..000000000000
--- a/net-analyzer/netdata/netdata-1.9.0.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2017 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 autotools fcaps linux-info python-r1 systemd user
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/firehol/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/firehol/${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/firehol/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"
-REQUIRED_USE="
-	mysql? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-# most unconditional dependencies are for plugins.d/charts.d.plugin:
-RDEPEND="
-	>=app-shells/bash-4:0
-	|| (
-		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}] )
-	)"
-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/netdata" || die
-
-	# Remove unneeded .keep files
-	find "${ED}" -name ".keep" -delete || die
-
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
-
-	fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
-
-	newinitd system/netdata-openrc ${PN}
-	systemd_dounit system/netdata.service
-	insinto /etc/netdata
-	doins system/netdata.conf
-}
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
index 7c343955b897..d22fa18925fe 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -90,13 +90,16 @@ src_configure() {
 src_install() {
 	default
 
-	rm -rf "${D}/var/cache/netdata" || die
+	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}
 
diff --git a/net-analyzer/netperf/Manifest b/net-analyzer/netperf/Manifest
index cad0a4ca48ad..9db300a11e26 100644
--- a/net-analyzer/netperf/Manifest
+++ b/net-analyzer/netperf/Manifest
@@ -6,6 +6,5 @@ AUX netperf-2.7.0-inline.patch 974 BLAKE2B 4e3174761db0b72656e22e361841bbb887da6
 AUX netperf-2.7.0-space.patch 455 BLAKE2B aa4fae48102f2d767a0c72a13b20820d9e42f782455876766399e7edc5625cd6ff0c740c3268aee4443d844ef6b28da69144c039bfdc63519a7279d2cc1ad433 SHA512 e39bfcec70da00fa886b1f8389f54eca6bac83fc8ff48a72427fcd30c3f605e4ec2d01d2f7161ae0fa26bd56283c03593caf756db7d808f0e3e4d3a90d50f1fc
 AUX netperf-fix-scripts.patch 819 BLAKE2B 59779076ad1e3315712f7db54451256dcbd04c2712020d0b39c0fb1969fbfec0cbf8a3f1b6203ce5622b45a2cc6877b1c1448b0d505aa98a034c2a7fd2f285e3 SHA512 d82b01695c432be2f7312641b5599514bf21ca4586f15406aa087034de8d7b66f000eafd02f685c56062a8639ff4158e01d56835e6b8c53baf46481b0a3d0f1a
 DIST netperf-2.7.0.tar.bz2 1024430 BLAKE2B 1263a2b3cee0790e4526245e522d29f8692a5a3e9d3b41468d1010bbee4d606a06904d9e0c4ac0af457bde562a476434be4c62a41e3c0dbf0e5c3aeb2ae5652a SHA512 5fb37945bead831247de9c8ba86b33f134ba39e753b483df72de97f536d0846538dadf61acc2dee57f04ab5d16a92afab4890e79a5d7ffa863afd526267fffad
-EBUILD netperf-2.7.0-r1.ebuild 1877 BLAKE2B c117075369a78b86c82e0edd569696a23c267b57f971baa2d37bbf12e2235904f1e53290e59a796657a46fda64e0b57b355680c17d7332b238011ef1d1a9f152 SHA512 a1cbc73bf527e97afdfa88b3644d2f459138363fc8232a5a657b502214fd0d3eb0b48579831df7c56c07ec954b41724ee7cd1555a74d9229ff796cb50e7c7e6f
-EBUILD netperf-2.7.0-r2.ebuild 1920 BLAKE2B 786d469ad8be710d5e1df43469e9a9a3e0dcc4b82295d1cad84fed00ca40a16ab6535e410d38ccbeb9d01d1bac72a4a11a01d14aeed37e3fcfc390cfb4963d7c SHA512 0dfc5521c78b597ea0f2f481ff198c1c735fd15a3b49f07bf9df6f1232ce2627bb1e99adcd68f844b0fbf25638c4002a92aba6f7aa747b0c6fc9ddbe22e50627
+EBUILD netperf-2.7.0-r2.ebuild 1919 BLAKE2B 21aae85ceff1b2d4728ee3a984c28796b2848e7a65de9513cd5a088ac9e747aa65370f6700ddf7f3f2f09c20b322fd3590e4894cb4459b5301cecebb84bf74f3 SHA512 b511f47c363bf844415c281fe664b7b96898eefbadcaf87189933a83dd17e349e7ddd7f8af2ee9a91c0cfb6919bdbec4a2b63a25829cfdf3817812661ce1a734
 MISC metadata.xml 775 BLAKE2B 7f097a5c5390a88319c63497486a12367b5b89ac7979e22271581f6c9b6eaa5c69209f4d3cc82c57e8a3b0d0c0469378cd73579447c56d9991379af46b7fca1d SHA512 c1aaecd84a7fe73d798842ed1c117357809069f3f8c30a6920abf6641c46a5885e170dcecf7f2172d376b7f010e6dd07c47e233f15289c5de432550f1d05845e
diff --git a/net-analyzer/netperf/netperf-2.7.0-r1.ebuild b/net-analyzer/netperf/netperf-2.7.0-r1.ebuild
deleted file mode 100644
index f1fa2ad05ae9..000000000000
--- a/net-analyzer/netperf/netperf-2.7.0-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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"
-
-HOMEPAGE="http://www.netperf.org/"
-LICENSE="netperf"
-SLOT="0"
-IUSE="demo sctp"
-
-DEPEND=">=sys-apps/sed-4"
-
-pkg_setup() {
-	enewuser netperf
-	enewgroup netperf
-}
-
-src_prepare() {
-	eapply \
-		"${FILESDIR}"/${PN}-fix-scripts.patch \
-		"${FILESDIR}"/${PN}-2.6.0-log-dir.patch \
-		"${FILESDIR}"/${PN}-2.7.0-includes.patch \
-		"${FILESDIR}"/${PN}-2.7.0-space.patch
-
-	# Fixing paths in scripts
-	sed -i \
-		-e 's:^\(NETHOME=\).*:\1"/usr/bin":' \
-		doc/examples/sctp_stream_script \
-		doc/examples/tcp_range_script \
-		doc/examples/tcp_rr_script \
-		doc/examples/tcp_stream_script \
-		doc/examples/udp_rr_script \
-		doc/examples/udp_stream_script \
-		|| die
-
-	# netlib.c:2292:5: warning: implicit declaration of function ‘sched_setaffinity’
-	# nettest_omni.c:2943:5: warning: implicit declaration of function ‘splice’
-	append-cppflags -D_GNU_SOURCE
-
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		$(use_enable demo) \
-		$(use_enable sctp)
-}
-
-src_install () {
-	default
-
-	# move netserver into sbin as we had it before 2.4 was released with its
-	# autoconf goodness
-	dodir /usr/sbin
-	mv "${D}"/usr/{bin,sbin}/netserver || die
-
-	# init.d / conf.d
-	newinitd "${FILESDIR}"/${PN}-2.7.0-init netperf
-	newconfd "${FILESDIR}"/${PN}-2.2-conf netperf
-
-	keepdir /var/log/${PN}
-	fowners netperf:netperf /var/log/${PN}
-	fperms 0755 /var/log/${PN}
-
-	# documentation and example scripts
-	dodoc AUTHORS ChangeLog NEWS README Release_Notes
-	dodir /usr/share/doc/${PF}/examples
-	#Scripts no longer get installed by einstall
-	cp doc/examples/*_script "${D}"/usr/share/doc/${PF}/examples || die
-}
diff --git a/net-analyzer/netperf/netperf-2.7.0-r2.ebuild b/net-analyzer/netperf/netperf-2.7.0-r2.ebuild
index 435bed3f65b2..99c1d045b092 100644
--- a/net-analyzer/netperf/netperf-2.7.0-r2.ebuild
+++ b/net-analyzer/netperf/netperf-2.7.0-r2.ebuild
@@ -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/wapiti/Manifest b/net-analyzer/wapiti/Manifest
index 612f7d5fb351..65c8cfde3aa6 100644
--- a/net-analyzer/wapiti/Manifest
+++ b/net-analyzer/wapiti/Manifest
@@ -1,6 +1,6 @@
-DIST wapiti-2.3.0.tar.gz 305739 BLAKE2B a425694bf334e373acd4e7a60734b1162a709a996eb322fd8d8c6a92c9db34e7ae3c8bab4f1b0a514e7f88cda8f9f7ba5f5d24e20425993c36d8283a12470d1f SHA512 a72e87f4c2aec3884d5de7018c7fe1ab32721fc86420167c0b7636f31d9718661c787ff3d4ee66cc27e3932497543d0324b0bd238c33ce16f41f39213c119af2
 DIST wapiti-3.0.0.tar.gz 528316 BLAKE2B f1845e762fa155746b9706cb379ac187d0b8136082f6545ad5c486b915975561dcea272eb8213c9a3347b42bb7e9653fd2303e47c12c91f4d66f31047afd5a44 SHA512 5a04dde6e4bc051a05d55fb4f3f7171ee659a64c51f807d3c6d4dd0d8d182688d9e48e8449a1aeedab34f04fbf89dc13fa97d13fb0fdb45ba6820bde6936e36e
-EBUILD wapiti-2.3.0.ebuild 508 BLAKE2B 72b4b8d4cc830ee3b1151f6aed2828e40be1a43f0097aea47d59ecba3044f219519b47e6cd51fc957bec475d43fdd2a965139ef8391aada1fabd43506bb73c48 SHA512 dea28c6d333d56e36a35f4d6aee96b36896a205e95cd799146f6cecb660dc12bb9ea6359af83b03a50f5772b71e69a4fad9545e20b48d2aa73d02e117f445eec
+DIST wapiti3-3.0.1.tar.gz 530486 BLAKE2B ccc13a14404269059d154aa32126cca6603be8d4f56b2adf2ffdd18c242ac2ea14306171a0ff5e4e654c3451db209668d4e5c9471bc3d5765cea71b1e9ff1fda SHA512 596df444d19cc2b98dd88f033c66ac65bcc8ab6e34508c1fa201503d2e61ca053ecddaa7a0814329c87e1e10c013306dd7dd4b56e644d4b5dab5924d75c6f4d7
 EBUILD wapiti-3.0.0.ebuild 778 BLAKE2B a7385fb08636ec161fd3a9c11061bf1af9806eed34e472cfe6d3fb2578d6483f13ad0cc7628f75c1f293523b04eef08fe9cc7e61a61d88c5631a78966345c31f SHA512 753e4d61b6be4ed012fc4251a7561dd8546632865f7485d5c68604718a8d2c1d73d1b518b2a99377be785091eef6e8fa0160aef6c46e1639fb257bb47ad325a7
+EBUILD wapiti-3.0.1.ebuild 820 BLAKE2B a30e47142ccb4747e39b9d592948430c3d68f43f2b07c9add6a00c909981dcbb9f71ff99339d5139bc7a0c20ad7346e5d766721df7b1daed9f9c210ba25fe905 SHA512 4eb9ce2415ef8ddfd95617319d714bd417ac7e539552d1809bd98d190cb1ea3983a00c643dae5160a168c159c01583d763f9f34756c217663cf1082fc9fd9755
 EBUILD wapiti-9999.ebuild 800 BLAKE2B e9b0f9d54f3c94904cbd217b7218141a6179528b6efd1c89f2356817df98ba902e8be297b72ad965ad5a70ee8a3d22f7b7def35ff3bee0a258dd08c053ac681d SHA512 10fb2896b49e009a38b8ca555197c0bb09d815e299c5dbc165217228e0817c6a983a2d47ac7c57625bb951777510dfcc04ece6e7a20808eb255be3b75064e9fc
 MISC metadata.xml 864 BLAKE2B 9551f009fa754e945364018cc66edcedc0b032929983895547b21dfdac4ad1a4dd33e72ef8613f4ed622631f04a96c4560a4a379b572e986086f8c5a9955d85c SHA512 6af9d0300f0d9edeff11f0478aaf2461337ac36c78ce3d0dd9c3fe30be33cb2b96a1e5fee2c4fe9e89c75bedd06347fd6ca27dfac8bc0d9c0539615487310f25
diff --git a/net-analyzer/wapiti/wapiti-2.3.0.ebuild b/net-analyzer/wapiti/wapiti-2.3.0.ebuild
deleted file mode 100644
index 00b046e1aac3..000000000000
--- a/net-analyzer/wapiti/wapiti-2.3.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='xml'
-
-inherit distutils-r1
-
-DESCRIPTION="Web-application vulnerability scanner"
-HOMEPAGE="http://wapiti.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.2.3[${PYTHON_USEDEP}]"
diff --git a/net-analyzer/wapiti/wapiti-3.0.1.ebuild b/net-analyzer/wapiti/wapiti-3.0.1.ebuild
new file mode 100644
index 000000000000..0b0c74416a8a
--- /dev/null
+++ b/net-analyzer/wapiti/wapiti-3.0.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE='xml'
+
+inherit distutils-r1
+
+MY_P=${PN}3-${PV}
+DESCRIPTION="Web-application vulnerability scanner"
+HOMEPAGE="http://wapiti.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="kerberos ntlm"
+
+DEPEND=""
+RDEPEND="dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.2.3[${PYTHON_USEDEP}]
+	dev-python/tld[${PYTHON_USEDEP}]
+	dev-python/yaswfp[${PYTHON_USEDEP}]
+	kerberos? ( dev-python/requests-kerberos[${PYTHON_USEDEP}] )
+	ntlm? ( dev-python/requests-ntlm[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index dfde766bd448..14ade1411675 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -3,19 +3,15 @@ AUX wireshark-2.1.0-sse4_2-r1.patch 498 BLAKE2B 05af1325a8bb709676fc2e205b41790f
 AUX wireshark-2.4-androiddump.patch 1135 BLAKE2B 8126f920def5e6faf4691d639dc3dde7e32aca4b3dd11928a50ddbfdec9b53386957eb473fa93fc21bf791c052a4808b03e00a775d4c1e9f61a1c007c03b6953 SHA512 d18daa46b3ff8f0f4e3e468c65c33fd1bf9fb9a8e90f6318a64cc11b696520b07ccfcbc9921f3c932fcceb809c0406a5cd9773a157ed1bfd10e4c8873215b36b
 AUX wireshark-2.4.3-libsmi.patch 7153 BLAKE2B 33b7237eb213fcb2aab0a9db9c28a22dfbd6d0a3434c5c2dd849415cec7b5cbb3573bb95c8a81224fc5bca639103437aafcfa05ab3554bdfb3c866013e38b19a SHA512 4027b6fc313c2186f4eb2a9cb050dea1687c9cff64a83ec0cec2a122ca588cb6334064a2c46dc9c9d66e8fd41056f27548e7aacb5193f82734b04e15f4a17c67
 AUX wireshark-2.6.0-androiddump-wsutil.patch 640 BLAKE2B 07e8bbb0a892d35fc58d63c6faff9b0aeb08ed0097be31b6dfa5335aedfb53c6d18768848c18f20ef3af47fb1299ec498b3386f5c25ee07153d03ef29d7d0986 SHA512 26f99d8abedf60ec590331bffbef14de59ef6581e70a098b5b93b264c7bfce7ad9208c3037b11d2477ab3a5e7fdb87ff401d759fb665dc078a075cf296a7a034
-AUX wireshark-2.6.0-qtsvg.patch 800 BLAKE2B 767fdc6f54ad226b5b55333bfeb9a0c79d989a274b430a582f7a79406ac424474af2b723ade963a8d52428dfc66686aeb71366d133cdf2b0e714efdde549628a SHA512 fe326b15364ce139ac616ba9e6799d2519b00d67fb6e770c5294e15c8141fcf6d9fb4462e31d609bd98ac15c3a67dedd9e37a2eec42f47c95861aba7dee20f31
 AUX wireshark-2.6.0-redhat.patch 248 BLAKE2B a3cc5af29cea1b46cc8456c80a1ddf3a0db464f1274beba49c440af831d708bf251ad7481231f27bd7d7f99cf50f964e7f8aa80ce3c0f4d3b06f00ce624f7347 SHA512 92d498c7b6c3a4ae461f5bbca090943dbd7a3151628eebd4b212f3d9eca133260fe46bc72c6bec8444a83517d7a69c334257c61f9fd8e1256f71dd70241e3f66
-AUX wireshark-2.6.1-Qt-5.11.patch 1968 BLAKE2B 74c96bfdec9540b7ea91dd71c9420ac735e9f9b7d2ebccafad5447252d7f6768184ce3af16628e966634473687f8da92e300b47c01ab2ce974a475e8796886b9 SHA512 a079b03d35733f837e73c5d2bd6860ccc3dc185f4488ac4768b3cf081bde15e86a562c7c5e445775e2618f993e8286d5bde9b0617f9d3f30e94d1802d4d75a63
 AUX wireshark-2.6.2-qtsvg.patch 548 BLAKE2B a86981841b4bd76c429d68bb94439317c29404a8917ee8419b7f9e729e857a6dafb94c738f656633672f4f31a8a0e3ccc6a1946b6db3a15b27244cf5ab34a7e5 SHA512 08530766e3e3e3273847a7147303c0bbb0f2b9230e54f057fe4e266ea4f67d577d301a4c02e63d69bb5cdeaf0445466c906278ab76e636a0f2bb8a886eb21ddc
 AUX wireshark-99999999-androiddump-wsutil.patch 772 BLAKE2B 061dc2253d10dd088ebf7cacbe6a1afadf2b5b41d37ad1de07e6c3985feb13934f743c3c303dab0548d4df4b762afd876ace6f522a3d0d750ed1d77b823402b7 SHA512 181683e22a2b694c28e49915d2b00e7c3261dc9eabc1893892d0c62f73b4aa28f3811a5b69ff496e2c166e2fa958f0a54776d63489337ccd4851d4eafddc0f0a
 AUX wireshark-99999999-androiddump.patch 202 BLAKE2B 31548a778c4a3b799bad8f920221ca7ccf774702e8018f982e00318afbaac174d4e7ae961fefd448cc56dca6b7d0448a2ac99d1e5afacb61a37de0546ee3557e SHA512 a9794c5bcb1d288c113e84b03ac4f185e6fb7bccc16aefa3311ebd37aab7e9d5c715022f5b54032812ac2ab1244c65d9fd716c826ee27e677b011976f218f9da
-AUX wireshark-99999999-qtsvg.patch 792 BLAKE2B 88a51d38d3854ff6488a5b3042866f9dba4a94009e241c1ec1838b008af7c006433d59b550a289bc132a01ee873838c22bc478f780d5e930afdb04de295426f0 SHA512 7cc0d21d5689fdae0714799f6b2ba3711a44eb353e55d4f367b5fd1974688be517d9629a8b68537edad8545ce5f5149109a5af3392d1c70e6d76734b7bae1822
+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.1.tar.xz 28386244 BLAKE2B fe45f4249c81fd83ce35384b7038d7f1b5e21d884a5faec4344dda8f0c8b71393207e043672ce57bb6f1c45800ffce8feed8573a064db8048b3c0268feb0b486 SHA512 e68f7fa5975f10feccb76ab64c9a00f141cd04a12fa586a9839c93630d3554565d8e2ddfab83ec31cb813485b14b3227b7ec6e59baef007a6fe74b8b2a5ed444
 DIST wireshark-2.6.2.tar.xz 28392140 BLAKE2B 08fb59061f618494ee07ca19cd97ab2ebe7c483419c1932e185dd42a0fe2b6d0070834ae5b7aaea4981f6fbc4baeaadb7c9eee8bf32b823af77e753c468257ce SHA512 e39cd8dec44c8c64e5da25df0ffda529130541e5267fb0bdaa232fb4a4438c28ac5c9169ba17a37119d6cedf04a022b40da09f35f44a3739bdfb9486703f39e2
 EBUILD wireshark-2.4.5.ebuild 7334 BLAKE2B 8a968571ad9b7ecfca31dab7e22feda54ecd9ca42e244b89cc8e6f024fc767c9bc81d7fa36408c9332381024b6cd75abda7607fa26bca0dccc7a5dc105a24d3d SHA512 08a980bdb34a2929ea2f0d62ff1dbd73328897ddd3c20d529b67e8564e487c216f0fcddddbaaf54f8132fbc2139261217d0c36e0d9c644c01020600e62b7096f
-EBUILD wireshark-2.6.1.ebuild 6604 BLAKE2B 7d29d72adf6b118afd922ec74bca8f261b98765ac4c28b76620eac8d1aced4329fd85fbe8e5707c0245402385b71f98aaa6a70c4ce080e37893e5c3fe1bd71e1 SHA512 1599d590d6adba1a29baa40045a7fed23f70bfa56e965cab1e8042269705c11194e87442dd152fd9ce5bf3f94fcf363daf69b177c961429db367da43bd6ad8c4
-EBUILD wireshark-2.6.2.ebuild 6566 BLAKE2B da412a21e0fc09082365ea38c19f3aaf0096da797925a47022e8099fb97e3503634529d046092802146f821516bfc68d386609abc945e59ce25f6c13c8c4609b SHA512 a41d38397e8bcd6d68f4111c757d447d45487106bcb30f3d5c54d45090a8d0c3ab82861bfad4fcc4923b4db5b2e741fd1b4cadb786503de5177ca087aa71842b
-EBUILD wireshark-99999999.ebuild 6369 BLAKE2B 099383aae55deb0186a58215a7fc5e13c07e5ebb309f06883ec1ba307fdb8dbb3f8da5b8a8edcf7623d01fef9b1297da44aeda2ec1fe6e16e92cd0af2404cfb8 SHA512 6dafc31e2a5726dd3f57d144b7944924199b331e2d241abbbb79a41641bf8df026a3a8b2db391df67dbb8fa92ca39e06cd9c6290949825668e9dfcbc37a27abe
+EBUILD wireshark-2.6.2.ebuild 6563 BLAKE2B 64241a1afc91e18f8bed540a201b66698f7c7c3bcfacd46a2ae240f768a0da80ec2f3c35369002b11569e8aab06cbecaa64425f55d24370f76052f560504a4af SHA512 ce4400fd1add8d0c2c5211c93e9f4a3245865e2a7e63a6377fbc62fc15a0b434e9b875d5af715820dba84a2c0b5d53ef48b6b3a44b13525cd64bf01725aaf3fe
+EBUILD wireshark-99999999.ebuild 6375 BLAKE2B 05637feca26d8c5cc2329b5a86a6bef9742e4470309ff569ccc23a9f1da56f30d9ae2bd16fa1862c5a21508d56b467cbf51cf4f3a31ce08894a7a06691284266 SHA512 4cfc11f50a4eddc08b7f526350752cf60bb016f0992f0bafe892ef834def88fe7915ff7d856c27c4d709c4e2d34ad9bd3d6ebb4f1e4e363e60c62b3706f07cac
 MISC metadata.xml 4787 BLAKE2B dcdb28c47094cfddc0effc4c16aa9132386f94d4d6e6cdb46f31a06ebb5dd7cd5c7bf967f50c6a002b7aeecddeb8aa8b86cb5961405a463c10389d6ec9b5cb7f SHA512 b683b159266bc37471ef26f6c0c4b2e94f72d2a77a2a7647e28b8b49e611973522af294c39050dbfa8aa5cca65bf2670f9d4c1e6a93d01b386e76f1ab75ff2e9
diff --git a/net-analyzer/wireshark/files/wireshark-2.6.0-qtsvg.patch b/net-analyzer/wireshark/files/wireshark-2.6.0-qtsvg.patch
deleted file mode 100644
index 633277275901..000000000000
--- a/net-analyzer/wireshark/files/wireshark-2.6.0-qtsvg.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -926,14 +926,12 @@
- 			Qt5LinguistTools
- 			Qt5Multimedia
- 			Qt5PrintSupport
--			Qt5Svg
- 			Qt5Widgets
- 		)
- 		set(Qt5Core_OPTIONS REQUIRED)
- 		set(Qt5LinguistTools_OPTIONS REQUIRED)
- 		set(Qt5Multimedia_OPTIONS REQUIRED)
- 		set(Qt5PrintSupport_OPTIONS REQUIRED)
--		set(Qt5Svg_OPTIONS REQUIRED)
- 		set(Qt5Widgets_OPTIONS REQUIRED)
- 		if (APPLE)
- 			set(PACKAGELIST ${PACKAGELIST} Qt5MacExtras)
-@@ -1229,11 +1227,6 @@
- 		# That's the name autofoo uses
- 		set(QT_MULTIMEDIA_LIB 1)
- 	endif()
--	if(Qt5Svg_FOUND)
--		set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5Svg_LIBRARIES})
--		# That's the name autofoo uses
--		set(QT_SVG_LIB 1)
--	endif()
- 	if(Qt5MacExtras_FOUND)
- 		set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5MacExtras_LIBRARIES})
- 		# That's the name autofoo uses
diff --git a/net-analyzer/wireshark/files/wireshark-2.6.1-Qt-5.11.patch b/net-analyzer/wireshark/files/wireshark-2.6.1-Qt-5.11.patch
deleted file mode 100644
index c8d8bb9ce9c2..000000000000
--- a/net-analyzer/wireshark/files/wireshark-2.6.1-Qt-5.11.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From b8e8aa87f43c12ad564426b3359f593305cd45a1 Mon Sep 17 00:00:00 2001
-From: Roland Knall <rknall@gmail.com>
-Date: Wed, 25 Apr 2018 10:28:30 +0200
-Subject: [PATCH] Qt: Fix various missing header includes
-
-Qt 5.11 seems to have changed the include dependencies, so adding those, that are missing
-
-Change-Id: I2b0482f7554467d6981be65bfd3fea1a3e118976
-Reviewed-on: https://code.wireshark.org/review/27145
-Petri-Dish: Roland Knall <rknall@gmail.com>
-Tested-by: Petri Dish Buildbot
-Reviewed-by: Roland Knall <rknall@gmail.com>
----
- ui/qt/packet_format_group_box.cpp | 1 +
- ui/qt/time_shift_dialog.cpp       | 1 +
- ui/qt/wireless_frame.cpp          | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/ui/qt/packet_format_group_box.cpp b/ui/qt/packet_format_group_box.cpp
-index a80a71aaaddfce2798ececcbb27a4d9e75382c1b..3c0fff28aa4cd91d344f2e70db1e66123bc17f41 100644
---- a/ui/qt/packet_format_group_box.cpp
-+++ b/ui/qt/packet_format_group_box.cpp
-@@ -10,6 +10,7 @@
- #include <ui_packet_format_group_box.h>
- 
- #include <QStyle>
-+#include <QStyleOption>
- 
- PacketFormatGroupBox::PacketFormatGroupBox(QWidget *parent) :
-     QGroupBox(parent),
-diff --git a/ui/qt/time_shift_dialog.cpp b/ui/qt/time_shift_dialog.cpp
-index 93882c09a377a5630e8bb09b4e80d7f6a84f7293..8460db2e966a0f572478de7430b8b63f4473dd16 100644
---- a/ui/qt/time_shift_dialog.cpp
-+++ b/ui/qt/time_shift_dialog.cpp
-@@ -14,6 +14,7 @@
- #include <ui/time_shift.h>
- #include <ui/qt/utils/tango_colors.h>
- 
-+#include <QStyleOption>
- 
- TimeShiftDialog::TimeShiftDialog(QWidget *parent, capture_file *cf) :
-     QDialog(parent),
-diff --git a/ui/qt/wireless_frame.cpp b/ui/qt/wireless_frame.cpp
-index bd9076abcf4a5d7b6fd73d2bc0b63b4fff8c256a..46fb2dd2f3054f66380239106fb2e27058196447 100644
---- a/ui/qt/wireless_frame.cpp
-+++ b/ui/qt/wireless_frame.cpp
-@@ -23,6 +23,7 @@
- #include <wsutil/frequency-utils.h>
- 
- #include <QProcess>
-+#include <QAbstractItemView>
- 
- // To do:
- // - Disable or hide invalid channel types.
diff --git a/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch b/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch
index 4f151dbba21b..231acd5a6faa 100644
--- a/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch
+++ b/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch
@@ -7,12 +7,12 @@
 -		Qt5Svg
  		Qt5Widgets
  	)
- 	set(Qt5Core_OPTIONS REQUIRED)
- 	set(Qt5LinguistTools_OPTIONS REQUIRED)
- 	set(Qt5Multimedia_OPTIONS REQUIRED)
- 	set(Qt5PrintSupport_OPTIONS REQUIRED)
--	set(Qt5Svg_OPTIONS REQUIRED)
- 	set(Qt5Widgets_OPTIONS REQUIRED)
+ 	set(Qt5Core_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
+ 	set(Qt5LinguistTools_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
+ 	set(Qt5Multimedia_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
+ 	set(Qt5PrintSupport_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
+-	set(Qt5Svg_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
+ 	set(Qt5Widgets_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
  	if (APPLE)
  		set(PACKAGELIST ${PACKAGELIST} Qt5MacExtras)
 @@ -1187,11 +1185,6 @@
diff --git a/net-analyzer/wireshark/wireshark-2.6.1.ebuild b/net-analyzer/wireshark/wireshark-2.6.1.ebuild
deleted file mode 100644
index 9e43a2a0eac0..000000000000
--- a/net-analyzer/wireshark/wireshark-2.6.1.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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
-		>=media-libs/speex-1.2.0
-		media-libs/speexdsp
-		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-qtsvg.patch
-	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
-	"${FILESDIR}"/${PN}-2.6.1-Qt-5.11.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.6.2.ebuild b/net-analyzer/wireshark/wireshark-2.6.2.ebuild
index 2eefb6006408..611a9be848d1 100644
--- a/net-analyzer/wireshark/wireshark-2.6.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.6.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc64 x86"
+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
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 820661327c1d..eb8caa256baa 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -12,11 +12,10 @@ LICENSE="GPL-2"
 SLOT="0/${PV}"
 KEYWORDS=""
 IUSE="
-	adns androiddump bcg729 +capinfos +caps +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
+	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/_/}
@@ -27,7 +26,7 @@ CDEPEND="
 	netlink? ( dev-libs/libnl:3 )
 	adns? ( >=net-dns/c-ares-1.5 )
 	bcg729? ( media-libs/bcg729 )
-	caps? ( sys-libs/libcap )
+	filecaps? ( sys-libs/libcap )
 	kerberos? ( virtual/krb5 )
 	sshdump? ( >=net-libs/libssh-0.6 )
 	ciscodump? ( >=net-libs/libssh-0.6 )
@@ -137,7 +136,7 @@ src_configure() {
 		-DBUILD_wireshark=$(usex qt5)
 		-DDISABLE_WERROR=yes
 		-DENABLE_BCG729=$(usex bcg729)
-		-DENABLE_CAP=$(usex caps)
+		-DENABLE_CAP=$(usex filecaps caps)
 		-DENABLE_CARES=$(usex adns)
 		-DENABLE_GNUTLS=$(usex ssl)
 		-DENABLE_KERBEROS=$(usex kerberos)