gentoo resync : 30.09.2018

30 files changed, 1117 insertions, 893 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index cb5127adb8c7..e80e15acfa62 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/check_mk/Manifest b/net-analyzer/check_mk/Manifest
deleted file mode 100644
index 215f318ab949..000000000000
--- a/net-analyzer/check_mk/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX check_mk-1.2.4p5-setup.sh.patch 2123 BLAKE2B be0dee96c29a8b61d4d4cdc83a9714faa2ef8b26020575bb21824c863d1792f7de004e176093c0b346cbf6a93f9d5733c877746e68cc2587e086038004d052d4 SHA512 eda9c4345b8f5b03ba7e6bfc077036830b6f8f9ee701d8064eddb96e63f11c43ae2093f9206884e5dc864beeba4c0b332bf4e7de18880567626d941457cbab47
-AUX check_mk-1.2.8p16-setup.sh.patch 1277 BLAKE2B 92fc6843fff170009dde4077808b8c55540f4c91bc8c00f3511e5d747fc071d075feaca005d8b734b9a88913b70adcdd9a7be13c4806a18b5f2b7cdd3f1380dd SHA512 da912ec90555104007f5a94b4092fc25918eca319981592e5b38cb3ce8172a817bc01af8d64cc59b8f86d105ea06f8f0dc83965490ce326efb9e6572d9382e1d
-DIST check_mk-1.2.4p5.tar.gz 6626768 BLAKE2B d8f40405d443cf4d25cf53ac4adff4361c79c4574993c708a8699ccc8e06623f2fdc2539ccb591e74fe984f3f7824a0a961c8f994439a02edb3440089bdfa453 SHA512 ca2c06288b91f44f017ebbc45bd6712ddcbebdc4e293598b793ae1ad19ad96814983a30bd66ee2f19940dc1d1439fba2ae2b171dcbe0e670ce1b7d0a8c18d890
-DIST check_mk-1.2.8p16.tar.gz 16298683 BLAKE2B 5023719c3e2e56807900ccb204862eccb73706bb23dfa3dfb4f30cb6fa592828e2d81aef12dd5129b280c37ca8d700c982f3b29469fd5ec0328e91e414b8c624 SHA512 601c76b2b62de9176122c69b011b5f7ac6b71650d1b3e411c103f5e9c3e91256ce8d3db6fcd1edc2a11f86dcba4e8ea18ec5a1f9f3eae5b25a4bb3ba712341eb
-EBUILD check_mk-1.2.4_p5-r1.ebuild 10413 BLAKE2B 165de0f771a135992e10e5da96e07cc52572002befd5ae16817de436bb095694e96e90d9e1403851bc9a1b1a0e4127ad54320da979263d9da3a8c9bb93396090 SHA512 54e0855c1f6c80596d580db0dbd61478cc4ea5a15c1fbc3cd3764c5547a0eddf7d018a4e7345fff6c0f6f9960e1273552f16194d9221fed92d5e5a7c82f581c0
-EBUILD check_mk-1.2.8_p16.ebuild 11335 BLAKE2B 7af3e2599be0bea866fff206fbfda2cfa570c1fb691e99f9fb33416ca75e6f9af11c354b0f038fa84573c8420614ff024d900e908b610264e7d0cee700c693b7 SHA512 af1945acdc4314ac018343b3d7323b9997f2a041de5db6cf6f6b9cbbea623c714b1f5f348f4fa098bbe183e701164ef6140dc1ec63db274bb16eda6b42acf0a0
-MISC metadata.xml 1507 BLAKE2B 9a52c3006f34fb08b7dad49633c7d3630cbff714e76d22e9bca6f8e24c0f290f82a4852e7bc5df7804d27bb01c85f929c0af2fda64a25ec9e7b12dfc660d4dfe SHA512 68ba95e5fe9b7f49de5f1db404f40633229627220eb737440cac5967181d1f97feda2e0d7f5af85c3f2cf795a3fa56ab22091b6f186b3dda379ab6005de59586
diff --git a/net-analyzer/check_mk/check_mk-1.2.4_p5-r1.ebuild b/net-analyzer/check_mk/check_mk-1.2.4_p5-r1.ebuild
deleted file mode 100644
index ef7a70f9a76a..000000000000
--- a/net-analyzer/check_mk/check_mk-1.2.4_p5-r1.ebuild
+++ /dev/null
@@ -1,323 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils toolchain-funcs python-r1
-
-DESCRIPTION="General purpose Nagios/Icinga plugin for retrieving data"
-HOMEPAGE="http://mathias-kettner.de/check_mk.html"
-
-MY_P="${P/_p/p}"
-MY_PV="${MY_P/check_mk-/}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="agent-only apache_status dmi_sysinfo livestatus logwatch mysql
-	nfsexports oracle postgres smart wato xinetd zypper"
-
-DEPEND="${PYTHON_DEPS}
-	wato? ( app-admin/sudo )
-	xinetd? ( sys-apps/xinetd )
-	!agent-only? ( || ( net-analyzer/nagios-core net-analyzer/icinga ) )
-	!agent-only? ( www-servers/apache www-apache/mod_python )
-	media-libs/libpng:0
-	!!net-analyzer/check_mk_agent"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	livestatus? ( !agent-only )
-	wato? ( !agent-only )"
-
-SRC_URI="http://mathias-kettner.de/download/${MY_P}.tar.gz"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# modify setup.sh for gentoo
-	epatch "${FILESDIR}"/${PN}-1.2.4p5-setup.sh.patch
-}
-
-src_configure() {
-	if has_version net-analyzer/nagios-core; then
-		export mydaemon=nagios
-		export nagpipe=/var/nagios/rw/nagios.cmd
-		export check_result_path=/var/nagios/spool/checkresults
-		export nagios_status_file=/var/nagios/status.dat
-		export rrd_path=/var/nagios/perfdata
-	else
-		export mydaemon=icinga
-		export nagpipe=/var/lib/icinga/rw/icinga.cmd
-		export check_result_path=/var/lib/icinga/spool/checkresults
-		export nagios_status_file=/var/lib/icinga/status.dat
-		export rrd_path=/var/lib/icinga/perfdata
-	fi
-
-	export nagiosuser=${mydaemon}
-	export nagios_binary=/usr/sbin/${mydaemon}
-	export nagios_config_file=/etc/${mydaemon}/${mydaemon}.cfg
-	export nagconfdir=/etc/${mydaemon}/check_mk.d
-	export nagios_startscript=/etc/init.d/${mydaemon}
-	export htpasswd_file=/etc/${mydaemon}/htpasswd.users
-	export nagios_auth_name="${mydaemon} Access"
-	export docdir=/usr/share/doc/${PF}
-	export checkmandir=/usr/share/doc/${PF}/checks
-	export check_icmp_path=/usr/lib/nagios/plugins/check_icmp
-	export wwwuser=apache
-	export wwwgroup=apache
-	export apache_config_dir=/etc/apache2/modules.d/
-
-	if use livestatus; then
-		export enable_livestatus=yes
-	else
-		export enable_livestatus=no
-	fi
-
-	export STRIPPROG=/bin/true
-}
-
-src_compile() {
-	DESTDIR=${S} ./setup.sh --yes || die "Error while running setup.sh"
-
-	# compile waitmax
-	cd "${S}"/usr/share/check_mk/agents || die "Couldn't cd to ${S}/usr/share/check_mk/agents"
-	if [[ -f waitmax ]]; then
-		rm waitmax || die "Couldn't delete precompiled waitmax file"
-	fi
-	sed -i -e 's#gcc -s -o waitmax waitmax\.c#gcc -o waitmax waitmax.c#' "${S}"/usr/share/check_mk/agents/Makefile || die "Couldn't modify remove strip from waitmax Makefile"
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" || die "Couldn't compile waitmax"
-
-	# Fix broken png files
-	pngfix -q --out=out.png "${S}/usr/share/check_mk/web/htdocs/images/icons/bookcase.png"
-	mv -f out.png "${S}/usr/share/check_mk/web/htdocs/images/icons/bookcase.png" || die
-	pngfix -q --out=out.png "${S}/usr/share/check_mk/web/htdocs/images/icon_auditlog.png"
-	mv -f out.png "${S}/usr/share/check_mk/web/htdocs/images/icon_auditlog.png" || die
-	pngfix -q --out=out.png "${S}/usr/share/check_mk/web/htdocs/images/button_auditlog_lo.png"
-	mv -f out.png "${S}/usr/share/check_mk/web/htdocs/images/button_auditlog_lo.png" || die
-}
-
-src_install() {
-	if ! use agent-only; then
-		# Apache configuration
-		insinto /etc/apache2/modules.d
-		doins etc/apache2/modules.d/zzz_check_mk.conf
-
-		if use wato; then
-			# sudoers configuration
-			cat << EOF > "${T}"/check_mk || die
-# Needed for WATO - the Check_MK Web Administration Tool
-Defaults:apache !requiretty
-apache ALL = (root) NOPASSWD: /usr/bin/check_mk --automation *
-EOF
-			insinto /etc/sudoers.d
-			doins "${T}"/check_mk
-		fi
-
-		# check_mk configuration
-		keepdir /etc/check_mk
-		insinto /etc/check_mk
-		doins etc/check_mk/main.mk
-		doins etc/check_mk/main.mk-${MY_PV}
-		doins etc/check_mk/multisite.mk
-		doins etc/check_mk/multisite.mk-${MY_PV}
-		keepdir /etc/check_mk/conf.d
-		insinto /etc/check_mk/conf.d
-		doins etc/check_mk/conf.d/README
-		keepdir /etc/check_mk/conf.d/wato
-		touch "${D}"/etc/check_mk/conf.d/distributed_wato.mk
-		keepdir /etc/check_mk/multisite.d
-		keepdir /etc/check_mk/multisite.d/wato
-		touch "${D}"/etc/check_mk/multisite.d/sites.mk
-
-		insinto /etc/${mydaemon}
-		doins etc/${mydaemon}/auth.serials
-
-		# Nagios / Icinga check_mk templates
-		insinto /etc/${mydaemon}/check_mk.d
-		doins etc/${mydaemon}/check_mk.d/check_mk_templates.cfg
-
-		dobin usr/bin/check_mk
-		dobin usr/bin/mkp
-		insinto /usr/bin
-		doins usr/bin/cmk
-
-		# remove compiled agent_modbus
-		if [[ -f ${S}/usr/share/doc/${PF}/treasures/modbus/agent_modbus ]]; then
-			rm "${S}"/usr/share/doc/${PF}/treasures/modbus/agent_modbus || die "Couldn't remove precompiled agent_modbus"
-		fi
-
-		insinto /usr/share/check_mk
-		doins -r usr/share/check_mk/*
-
-		keepdir /var/lib/check_mk/autochecks
-		keepdir /var/lib/check_mk/cache
-		keepdir /var/lib/check_mk/counters
-		keepdir /var/lib/check_mk/logwatch
-		keepdir /var/lib/check_mk/notify
-		keepdir /var/lib/check_mk/packages
-		insinto /var/lib/check_mk/packages
-		doins var/lib/check_mk/packages/check_mk
-		keepdir /var/lib/check_mk/precompiled
-		keepdir /var/lib/check_mk/snmpwalks
-		keepdir /var/lib/check_mk/tmp
-		keepdir /var/lib/check_mk/wato
-		keepdir /var/lib/check_mk/web
-
-		# Update check_mk defaults
-		sed -i -e "s#^\(check_mk_automation\s*= 'sudo -u\) portage \(.*\)\$#\1 ${mydaemon} \2#" "${D}"/usr/share/check_mk/modules/defaults || die "Couldn't update check_mk defaults"
-		cp "${D}"/usr/share/check_mk/modules/defaults "${D}"/usr/share/check_mk/web/htdocs/defaults.py || die "Couldn't copy check_mk defaults"
-
-		# Change permissions
-		fowners -R ${mydaemon}:apache /etc/${mydaemon}/auth.serials
-		fperms -R 0660 /etc/${mydaemon}/auth.serials
-		fowners -R ${mydaemon}:${mydaemon} /etc/${mydaemon}/check_mk.d
-		fperms -R 0775 /etc/${mydaemon}/check_mk.d
-		fowners -R root:apache /etc/check_mk/conf.d/wato
-		fperms -R 0775 /etc/check_mk/conf.d/wato
-		fowners root:apache /etc/check_mk/conf.d/distributed_wato.mk
-		fperms 0664 /etc/check_mk/conf.d/distributed_wato.mk
-		fowners -R root:apache /etc/check_mk/multisite.d/wato
-		fperms -R 0775 /etc/check_mk/multisite.d/wato
-		fowners root:apache /etc/check_mk/multisite.d/sites.mk
-		fperms 0664 /etc/check_mk/multisite.d/sites.mk
-		fowners root:${mydaemon} /var/lib/check_mk/cache
-		fperms 0775 /var/lib/check_mk/counters
-		fowners -R root:${mydaemon} /var/lib/check_mk/counters
-		fperms 0775 /var/lib/check_mk/notify
-		fowners -R root:${mydaemon} /var/lib/check_mk/notify
-		fperms 0775 /var/lib/check_mk/logwatch
-		fowners -R root:${mydaemon} /var/lib/check_mk/logwatch
-		fperms 0775 /var/lib/check_mk/cache
-		fowners -R root:${mydaemon} /var/lib/check_mk/cache
-		fperms -R 0775 /var/lib/check_mk/tmp
-		fowners -R root:apache /var/lib/check_mk/tmp
-		fperms -R 0775 /var/lib/check_mk/web
-		fowners -R root:apache /var/lib/check_mk/web
-		fperms -R 0775 /var/lib/check_mk/wato
-		fowners -R root:apache /var/lib/check_mk/wato
-	fi
-
-	# Install agent related files
-	newbin usr/share/check_mk/agents/check_mk_agent.linux check_mk_agent
-	dobin usr/share/check_mk/agents/waitmax
-
-	if use xinetd; then
-		insinto /etc/xinetd.d
-		newins usr/share/check_mk/agents/xinetd.conf check_mk
-	fi
-
-	keepdir /usr/lib/check_mk_agent/local
-	keepdir /usr/lib/check_mk_agent/plugins
-
-	# Install Livestatus
-	if use livestatus; then
-		cat << EOF > "${T}"/livestatus.cfg || die
-define module{
-	module_name		mk-livestatus
-	module_type		neb
-	path			/usr/lib/check_mk/livestatus.o
-	args			/var/lib/${mydaemon}/rw/live
-	}
-EOF
-
-		insinto /etc/${mydaemon}/modules
-		doins "${T}"/livestatus.cfg
-		fowners ${mydaemon}:${mydaemon} /etc/${mydaemon}/modules/livestatus.cfg
-
-		insinto /usr/lib/check_mk
-		doins usr/lib/check_mk/livestatus.o
-
-		dobin usr/bin/unixcat
-
-		keepdir /usr/share/check_mk/livestatus
-	fi
-
-	# Documentation
-	if ! use agent-only; then
-		dodoc -r usr/share/doc/${PF}/*
-		docompress -x /usr/share/doc/${PF}/checks/
-	else
-		dodoc usr/share/doc/${PF}/AUTHORS usr/share/doc/${PF}/COPYING usr/share/doc/${PF}/ChangeLog
-		docompress
-	fi
-
-	# Install the check_mk_agent logwatch plugin
-	if use logwatch; then
-		insinto /etc/check_mk
-		doins usr/share/check_mk/agents/logwatch.cfg
-		exeinto /usr/lib/check_mk_agent/plugins
-		doexe usr/share/check_mk/agents/plugins/mk_logwatch
-	fi
-
-	# Install the check_mk_agent smart plugin
-	if use smart; then
-		exeinto /usr/lib/check_mk_agent/plugins
-		doexe usr/share/check_mk/agents/plugins/smart
-	fi
-
-	# Install the check_mk_agent mysql plugin
-	if use mysql; then
-		exeinto /usr/lib/check_mk_agent/plugins
-		doexe usr/share/check_mk/agents/plugins/mk_mysql
-	fi
-
-	# Install the check_mk_agent postgres plugin
-	if use postgres; then
-		exeinto /usr/lib/check_mk_agent/plugins
-		doexe usr/share/check_mk/agents/plugins/mk_postgres
-	fi
-
-	# Install the check_mk_agent apache_status plugin
-	if use apache_status; then
-		exeinto /usr/lib/check_mk_agent/plugins
-		doexe usr/share/check_mk/agents/plugins/apache_status
-	fi
-
-	# Install the check_mk_agent zypper plugin
-	if use zypper; then
-		exeinto /usr/lib/check_mk_agent/plugins
-		doexe usr/share/check_mk/agents/plugins/mk_zypper
-	fi
-
-	# Install the check_mk_agent oracle plugin
-	if use oracle; then
-		exeinto /usr/lib/check_mk_agent/plugins
-		doexe usr/share/check_mk/agents/plugins/mk_oracle
-	fi
-
-	# Install the check_mk_agent nfsexports plugin
-	if use nfsexports; then
-		exeinto /usr/lib/check_mk_agent/plugins
-		doexe usr/share/check_mk/agents/plugins/nfsexports
-	fi
-
-	# Install the check_mk_agent dmi_sysinfo plugin
-	if use dmi_sysinfo; then
-		exeinto /usr/lib/check_mk_agent/plugins
-		doexe usr/share/check_mk/agents/plugins/dmi_sysinfo
-	fi
-}
-
-pkg_postinst() {
-	if ! use agent-only; then
-		elog "IMPORTANT: Please add the following line to your"
-		elog "/etc/${mydaemon}/${mydaemon}.cfg, so that"
-		elog "${mydaemon} can load your check_mk configuration."
-		elog
-		elog "  cfg_dir=/etc/${mydaemon}/check_mk.d"
-		elog
-	fi
-	if use wato; then
-		elog "INFO: Your webserver needs write access to"
-		elog "/etc/${mydaemon}/htpasswd.users!"
-		elog "otherwise wato will not function correctly!"
-		elog
-		elog "chown ${mydaemon}: /etc/${mydaemon}/htpasswd.users"
-		elog "chmod 660 /etc/${mydaemon}/htpasswd.users"
-		elog
-	fi
-}
diff --git a/net-analyzer/check_mk/check_mk-1.2.8_p16.ebuild b/net-analyzer/check_mk/check_mk-1.2.8_p16.ebuild
deleted file mode 100644
index cd3279356bc9..000000000000
--- a/net-analyzer/check_mk/check_mk-1.2.8_p16.ebuild
+++ /dev/null
@@ -1,351 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit toolchain-funcs user systemd python-single-r1
-
-DESCRIPTION="General purpose Nagios/Icinga plugin for retrieving data"
-HOMEPAGE="http://mathias-kettner.de/check_mk.html"
-
-MY_P="${P/_p/p}"
-MY_PV="${MY_P/check_mk-/}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="agent-only apache_status livestatus logwatch mysql +nagios4
-	nfsexports oracle postgres smart wato xinetd zypper"
-
-RDEPEND="${PYTHON_DEPS}
-	wato? ( app-admin/sudo )
-	xinetd? ( || ( sys-apps/xinetd sys-apps/systemd ) )
-	!agent-only? (
-		www-servers/apache[apache2_modules_access_compat(+)]
-		www-apache/mod_python[${PYTHON_USEDEP}]
-		livestatus? ( net-analyzer/mk-livestatus[nagios4=] )
-		nagios4? ( >=net-analyzer/nagios-core-4 )
-		!nagios4? ( || ( <net-analyzer/nagios-core-4 net-analyzer/icinga ) )
-	)
-	media-libs/libpng:0
-	!!net-analyzer/check_mk_agent"
-DEPEND="${DEPEND}"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	livestatus? ( !agent-only )
-	wato? ( !agent-only )"
-
-SRC_URI="http://mathias-kettner.de/download/${MY_P}.tar.gz"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# modify setup.sh for gentoo
-	eapply "${FILESDIR}"/${PN}-1.2.8p16-setup.sh.patch
-	eapply_user
-}
-
-src_configure() {
-	if has_version net-analyzer/nagios-core; then
-		einfo "Using nagios as net-analyzer/nagios-core found"
-		export mydaemon=nagios
-		export nagpipe=/var/nagios/rw/nagios.cmd
-		export check_result_path=/var/nagios/spool/checkresults
-		export nagios_status_file=/var/nagios/status.dat
-		export rrd_path=/var/nagios/perfdata
-		if use livestatus; then
-			export livesock=/var/nagios/rw/live
-		fi
-	else
-		einfo "Using icinga as net-analyzer/nagios-core not found"
-		export mydaemon=icinga
-		export nagpipe=/var/lib/icinga/rw/icinga.cmd
-		export check_result_path=/var/lib/icinga/spool/checkresults
-		export nagios_status_file=/var/lib/icinga/status.dat
-		export rrd_path=/var/lib/icinga/perfdata
-		if use livestatus; then
-			export livesock=/var/lib/icigna/rw/live
-		fi
-	fi
-
-	export nagiosuser=${mydaemon}
-	export nagios_binary=/usr/sbin/${mydaemon}
-	export nagios_config_file=/etc/${mydaemon}/${mydaemon}.cfg
-	export nagconfdir=/etc/${mydaemon}/check_mk.d
-	export nagios_startscript=/etc/init.d/${mydaemon}
-	export htpasswd_file=/etc/${mydaemon}/htpasswd.users
-	export nagios_auth_name="${mydaemon} Access"
-	export docdir=/usr/share/doc/${PF}
-	export checkmandir=/usr/share/doc/${PF}/checks
-	export check_icmp_path=/usr/lib/nagios/plugins/check_icmp
-	export wwwuser=apache
-	export wwwgroup=apache
-	export apache_config_dir=/etc/apache2/modules.d/
-	export enable_livestatus=no
-	export STRIPPROG=/bin/true
-
-	mkdir -p "${S}"/usr/share/check_mk/agents || die
-	cat <<EOF >"${S}"/usr/share/check_mk/agents/Makefile
-all: waitmax
-
-waitmax: waitmax.c
-	\$(CC) \$(CFLAGS) \$< -o \$@ \$(LDFLAGS)
-
-EOF
-}
-
-src_compile() {
-	DESTDIR=${S} ./setup.sh --yes || die "Error while running setup.sh"
-
-	# compile waitmax
-	pushd "${S}"/usr/share/check_mk/agents &>/dev/null || die
-	if [[ -f waitmax ]]; then
-		rm waitmax || die "Couldn't delete precompiled waitmax file"
-	fi
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)"
-	popd &>/dev/null || die
-
-	# Fix broken png files
-	einfo "Fixing broken png files."
-	local x=0;
-	for png in "${S}"/usr/share/check_mk/web/htdocs/images/icons/*.png ; do
-		echo ${png#${S}}
-		pngfix -q --out="${T}"/out.png "${png}" && \
-		mv -f "${T}"/out.png "${png}" || die
-		x=$((x+1))
-	done
-	einfo "$x png files processed."
-
-	# enforce the correct python in these wrapper scripts
-	sed -i -e "/exec/s/python /${EPYTHON} /" usr/bin/{check_mk,mkp} || die
-	sed -i -e "/command_line/s#python /var#${EPYTHON} /var#" \
-		usr/share/check_mk/check_mk_templates.cfg || die
-
-	# fix all shebangs
-	find usr -type f -name \*.py |while read py ; do
-		grep '^#!' ${py} &>/dev/null && \
-		python_fix_shebang ${py}
-	done
-}
-
-src_install() {
-	if ! use agent-only; then
-		# Apache configuration
-		insinto /etc/apache2/modules.d
-		doins etc/apache2/modules.d/zzz_check_mk.conf
-
-		if use wato; then
-			# sudoers configuration
-			cat << EOF > "${T}"/check_mk || die
-# Needed for WATO - the Check_MK Web Administration Tool
-Defaults:apache !requiretty
-apache ALL = (root) NOPASSWD: /usr/bin/check_mk --automation *
-EOF
-			insinto /etc/sudoers.d
-			doins "${T}"/check_mk
-		fi
-
-		# check_mk configuration
-		#keepdir /etc/check_mk
-		insinto /etc/check_mk
-		doins etc/check_mk/main.mk
-		doins etc/check_mk/main.mk-${MY_PV}
-		doins etc/check_mk/multisite.mk
-		doins etc/check_mk/multisite.mk-${MY_PV}
-		#keepdir /etc/check_mk/conf.d
-		insinto /etc/check_mk/conf.d
-		doins etc/check_mk/conf.d/README
-		dodir /etc/check_mk/conf.d/wato
-		touch "${D}"/etc/check_mk/conf.d/distributed_wato.mk
-		#keepdir /etc/check_mk/multisite.d
-		dodir /etc/check_mk/multisite.d/wato
-		touch "${D}"/etc/check_mk/multisite.d/sites.mk
-
-		insinto /etc/${mydaemon}
-		doins etc/${mydaemon}/auth.serials
-
-		# Nagios / Icinga check_mk templates
-		insinto /etc/${mydaemon}/check_mk.d
-		doins etc/${mydaemon}/check_mk.d/check_mk_templates.cfg
-
-		dobin usr/bin/check_mk
-		dobin usr/bin/mkp
-		dosym /usr/bin/check_mk /usr/bin/cmk
-
-		# remove compiled agent_modbus
-		if [[ -f ${S}/usr/share/doc/${PF}/treasures/modbus/agent_modbus ]]; then
-			rm "${S}"/usr/share/doc/${PF}/treasures/modbus/agent_modbus || die "Couldn't remove precompiled agent_modbus"
-		fi
-
-		insinto /usr/share/check_mk
-		doins -r usr/share/check_mk/*
-
-		keepdir /var/lib/check_mk/autochecks
-		keepdir /var/lib/check_mk/cache
-		keepdir /var/lib/check_mk/counters
-		keepdir /var/lib/check_mk/inventory
-		keepdir /var/lib/check_mk/log
-		keepdir /var/lib/check_mk/logwatch
-		keepdir /var/lib/check_mk/notify
-		keepdir /var/lib/check_mk/precompiled
-		keepdir /var/lib/check_mk/snmpwalks
-		keepdir /var/lib/check_mk/tmp
-		keepdir /var/lib/check_mk/wato
-		keepdir /var/lib/check_mk/web
-
-		insinto /var/lib/check_mk/packages
-		doins var/lib/check_mk/packages/check_mk
-
-		# Update check_mk defaults
-		sed -i -e "s#^\(check_mk_automation\s*= 'sudo -u\) portage \(.*\)\$#\1 ${mydaemon} \2#" "${D}"/usr/share/check_mk/modules/defaults || die "Couldn't update check_mk defaults"
-		cp "${D}"/usr/share/check_mk/modules/defaults "${D}"/usr/share/check_mk/web/htdocs/defaults.py || die "Couldn't copy check_mk defaults"
-
-		# Change permissions
-		fowners -R ${mydaemon}:apache /etc/${mydaemon}/auth.serials
-		fperms -R 0660 /etc/${mydaemon}/auth.serials
-		fowners -R ${mydaemon}:${mydaemon} /etc/${mydaemon}/check_mk.d
-		fperms -R 0775 /etc/${mydaemon}/check_mk.d
-		fowners -R root:apache /etc/check_mk/conf.d/wato
-		fperms -R 0775 /etc/check_mk/conf.d/wato
-		fowners root:apache /etc/check_mk/conf.d/distributed_wato.mk
-		fperms 0664 /etc/check_mk/conf.d/distributed_wato.mk
-		fowners -R root:apache /etc/check_mk/multisite.d/wato
-		fperms -R 0775 /etc/check_mk/multisite.d/wato
-		fowners root:apache /etc/check_mk/multisite.d/sites.mk
-		fperms 0664 /etc/check_mk/multisite.d/sites.mk
-		fowners root:${mydaemon} /var/lib/check_mk/cache
-		fperms 0775 /var/lib/check_mk/counters
-		fowners -R root:${mydaemon} /var/lib/check_mk/counters
-		fperms 0775 /var/lib/check_mk/notify
-		fowners -R root:${mydaemon} /var/lib/check_mk/notify
-		fperms 0775 /var/lib/check_mk/inventory
-		fowners -R root:${mydaemon} /var/lib/check_mk/inventory
-		fperms 0775 /var/lib/check_mk/log
-		fowners -R root:${mydaemon} /var/lib/check_mk/log
-		fperms 0775 /var/lib/check_mk/logwatch
-		fowners -R root:${mydaemon} /var/lib/check_mk/logwatch
-		fperms 0775 /var/lib/check_mk/cache
-		fowners -R root:${mydaemon} /var/lib/check_mk/cache
-		fperms -R 0775 /var/lib/check_mk/tmp
-		fowners -R root:apache /var/lib/check_mk/tmp
-		fperms -R 0775 /var/lib/check_mk/web
-		fowners -R root:apache /var/lib/check_mk/web
-		fperms -R 0775 /var/lib/check_mk/wato
-		fowners -R root:apache /var/lib/check_mk/wato
-		fperms -R 0775 /var/lib/check_mk/
-		fowners -R ${mydaeon}:apache /var/lib/check_mk/
-	fi
-
-	# Install agent related files
-	newbin usr/share/check_mk/agents/check_mk_agent.linux check_mk_agent
-	dobin usr/share/check_mk/agents/waitmax
-
-	if use xinetd; then
-		pushd "${S}"/usr/share/check_mk/agents/cfg_examples &>/dev/null || die
-		insinto /etc/xinetd.d
-		newins xinetd.conf check_mk
-		systemd_dounit systemd/check_mk@.service systemd/check_mk.socket
-		popd &>/dev/null || die
-	fi
-
-	keepdir /usr/lib/check_mk_agent/local
-	keepdir /usr/lib/check_mk_agent/plugins
-
-	# Documentation
-	if ! use agent-only; then
-		dodoc -r usr/share/doc/${PF}/*
-		docompress -x /usr/share/doc/${PF}/checks/
-	else
-		dodoc usr/share/doc/${PF}/AUTHORS usr/share/doc/${PF}/COPYING usr/share/doc/${PF}/ChangeLog
-		docompress
-	fi
-
-	# Install the check_mk_agent logwatch plugin
-	if use logwatch; then
-		insinto /etc/check_mk
-		doins usr/share/check_mk/agents/cfg_examples/logwatch.cfg
-		exeinto /usr/lib/check_mk_agent/plugins
-		doexe usr/share/check_mk/agents/plugins/mk_logwatch
-	fi
-
-	# Install the check_mk_agent smart plugin
-	if use smart; then
-		exeinto /usr/lib/check_mk_agent/plugins
-		doexe usr/share/check_mk/agents/plugins/smart
-	fi
-
-	# Install the check_mk_agent mysql plugin
-	if use mysql; then
-		exeinto /usr/lib/check_mk_agent/plugins
-		doexe usr/share/check_mk/agents/plugins/mk_mysql
-	fi
-
-	# Install the check_mk_agent postgres plugin
-	if use postgres; then
-		exeinto /usr/lib/check_mk_agent/plugins
-		doexe usr/share/check_mk/agents/plugins/mk_postgres
-	fi
-
-	# Install the check_mk_agent apache_status plugin
-	if use apache_status; then
-		exeinto /usr/lib/check_mk_agent/plugins
-		doexe usr/share/check_mk/agents/plugins/apache_status
-	fi
-
-	# Install the check_mk_agent zypper plugin
-	if use zypper; then
-		exeinto /usr/lib/check_mk_agent/plugins
-		doexe usr/share/check_mk/agents/plugins/mk_zypper
-	fi
-
-	# Install the check_mk_agent oracle plugin
-	if use oracle; then
-		exeinto /usr/lib/check_mk_agent/plugins
-		doexe usr/share/check_mk/agents/plugins/mk_oracle
-	fi
-
-	# Install the check_mk_agent nfsexports plugin
-	if use nfsexports; then
-		exeinto /usr/lib/check_mk_agent/plugins
-		doexe usr/share/check_mk/agents/plugins/nfsexports
-	fi
-}
-
-pkg_postinst() {
-	if ! use agent-only; then
-		elog "IMPORTANT: Please add the following line to your"
-		elog "/etc/${mydaemon}/${mydaemon}.cfg, so that"
-		elog "${mydaemon} can load your check_mk configuration."
-		elog
-		elog "  cfg_dir=/etc/${mydaemon}/check_mk.d"
-		elog
-	fi
-	if use wato; then
-		elog "INFO: Your webserver needs write access to"
-		elog "/etc/${mydaemon}/htpasswd.users!"
-		elog "otherwise wato will not function correctly!"
-		elog
-		elog "chown ${mydaemon}: /etc/${mydaemon}/htpasswd.users"
-		elog "chmod 660 /etc/${mydaemon}/htpasswd.users"
-		elog
-		elog "Alternatively with ACLs:"
-		elog "setfacl -m u:apache:rw /etc/${mydaemon}/htpasswd.users"
-		elog "setfacl -m g:apache:rw /etc/${mydaemon}/htpasswd.users"
-		elog
-	fi
-	if use livestatus; then
-		elog "In order for livestatus to work, you need to make sure that"
-		if has_version net-analyzer/nagios-core; then
-			elog "nagios is loading the livestatus broker module.  Please"
-			elog "ensure to add to your nagios.cfg the lines in"
-			elog "/usr/share/mk-livestatus/nagios.cfg"
-		else
-			elog "icigna is loading the livestatus broker module.  Please"
-			elog "include /usr/share/mk-livestatus/icigna.cfg in your"
-			elog "icigna configuration."
-		fi
-	fi
-}
diff --git a/net-analyzer/check_mk/files/check_mk-1.2.4p5-setup.sh.patch b/net-analyzer/check_mk/files/check_mk-1.2.4p5-setup.sh.patch
deleted file mode 100644
index 07dffa35b2d9..000000000000
--- a/net-analyzer/check_mk/files/check_mk-1.2.4p5-setup.sh.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- check_mk-1.2.4p5.orig/setup.sh	2014-07-04 09:24:45.000000000 +0200
-+++ check_mk-1.2.4p5/setup.sh	2015-08-28 13:22:19.986733809 +0200
-@@ -572,6 +572,11 @@
-            CONFIGURE_OPTS="--with-nagios4"
-         fi
-    fi
-+   # disable stripping to get meaningful backtraces
-+   sed -i -e 's/^INSTALL_STRIP_PROGRAM="\\\$(install_sh) -c -s"$/INSTALL_STRIP_PROGRAM="\\\$(install_sh) -c"/' configure
-+   sed -i -e 's/install_sh_PROGRAM="\$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \\$/install_sh_PROGRAM="\$(INSTALL_STRIP_PROGRAM)" \\/' Makefile.in
-+   sed -i -e 's/install_sh_PROGRAM="\$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \\$/install_sh_PROGRAM="\$(INSTALL_STRIP_PROGRAM)" \\/' src/Makefile.in
-+   sed -i -e 's/\$(CXX) \$(LDFLAGS) -s -fPIC -shared \$(livestatus_so_OBJECTS) -o \$@ -lpthread -lstdc++/\$(CXX) \$(LDFLAGS) -fPIC -shared \$(livestatus_so_OBJECTS) -o \$@ -lpthread -lstdc++/' src/Makefile.in
-    ./configure --libdir=$libdir --bindir=$bindir $CONFIGURE_OPTS &&
-    make clean &&
-    cat <<EOF > src/livestatus.h &&
-@@ -581,7 +586,8 @@
- #endif // livestatus_h
- EOF
-    make -j 8  2>&1 &&
--   strip src/livestatus.o &&
-+   # disable stripping to get meaningful backtraces
-+   #strip src/livestatus.o &&
-    mkdir -p $DESTDIR$libdir &&
-    install -m 755 src/livestatus.o $DESTDIR$libdir &&
-    mkdir -p $DESTDIR$bindir &&
-@@ -1018,9 +1024,11 @@
-            # WATO. Also create an empty and Apache-writable auth.serials
-            serials_file=$DESTDIR${htpasswd_file%/*}/auth.serials &&
-            touch "$serials_file" &&
--           (chown $wwwuser "$serials_file" || true) &&
--           (chown $wwwuser "$htpasswd_file" || true) &&
--	   create_sudo_configuration &&
-+           # Permissions will be set within src_install
-+           #(chown $wwwuser "$serials_file" || true) &&
-+           #(chown $wwwuser "$htpasswd_file" || true) &&
-+	   # disable sudo configuration as this will be done within src_install
-+	   #create_sudo_configuration &&
-            if [ "$enable_mkeventd" = yes ]
-            then
- 	       if [ -z "$YES" ] ; then echo -n "(Compiling Event Console binaries..." ; fi
diff --git a/net-analyzer/check_mk/files/check_mk-1.2.8p16-setup.sh.patch b/net-analyzer/check_mk/files/check_mk-1.2.8p16-setup.sh.patch
deleted file mode 100644
index b30d1ad1dad1..000000000000
--- a/net-analyzer/check_mk/files/check_mk-1.2.8p16-setup.sh.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/setup.sh	2014-07-04 09:24:45.000000000 +0200
-+++ b/setup.sh	2015-08-28 13:22:19.986733809 +0200
-@@ -564,6 +564,17 @@
- 
- compile_livestatus ()
- {
-+   echo "Skipping internal compile of livestatus, do it in ebuild instead"
-+   cat <<EOF > $SRCDIR/livestatus.src/src/livestatus.h 
-+#ifndef livestatus_h
-+#define livestatus_h
-+#define DEFAULT_SOCKET_PATH "$livesock"
-+#endif // livestatus_h
-+EOF
-+}
-+
-+avoid_compile_livestatus ()
-+{
-    local D=$SRCDIR/livestatus.src
-    rm -rf $D
-    mkdir -p $D
-@@ -1018,9 +1029,11 @@
-            # WATO. Also create an empty and Apache-writable auth.serials
-            serials_file=$DESTDIR${htpasswd_file%/*}/auth.serials &&
-            touch "$serials_file" &&
--           (chown $wwwuser "$serials_file" || true) &&
--           (chown $wwwuser "$htpasswd_file" || true) &&
--	   create_sudo_configuration &&
-+           # Permissions will be set within src_install
-+           #(chown $wwwuser "$serials_file" || true) &&
-+           #(chown $wwwuser "$htpasswd_file" || true) &&
-+	   # disable sudo configuration as this will be done within src_install
-+	   #create_sudo_configuration &&
-            if [ "$enable_mkeventd" = yes ]
-            then
- 	       if [ -z "$YES" ] ; then echo -n "(Compiling Event Console binaries..." ; fi
diff --git a/net-analyzer/check_mk/metadata.xml b/net-analyzer/check_mk/metadata.xml
deleted file mode 100644
index e7ef436d1159..000000000000
--- a/net-analyzer/check_mk/metadata.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-	<longdescription lang="en">
-		General purpose Nagios/Icinga plugin for retrieving data.
-		Check_MK is a collection of extensions for the IT-Monitoring-Kernel 
-		of Nagios/Icinga and together with this, and ideally also with 
-		PNP4Nagios and NagVis constitutes a complete IT-Monitoring-System.
-	</longdescription>
-	<use>
-		<flag name="agent-only">Install only the check_mk agent.</flag>
-		<flag name="logwatch">Install check_mk-agent logwatch plugin.</flag>
-		<flag name="smart">Install check_mk-agent S.M.A.R.T plugin.</flag>
-		<flag name="mysql">Install check_mk-agent mysql plugin.</flag>
-		<flag name="nagios4">Depend on <pkg>net-analyzer/nagios-core</pkg>-4</flag>
-		<flag name="postgres">Install check_mk-agent postgres plugin.</flag>
-		<flag name="apache_status">Install check_mk-agent apache-status plugin.</flag>
-		<flag name="nfsexports">Install check_mk-agent nfsexports plugin.</flag>
-		<flag name="dmi_sysinfo">Install check_mk-agent dmi_sysinfo plugin.</flag>
-		<flag name="zypper">Install check_mk-agent zypper plugin.</flag>
-		<flag name="livestatus">Enable livestatus.</flag>
-		<flag name="wato">Enable check_mk WATO - check_mk's Web Administration Tool.</flag>
-	</use>
-	<upstream>
-		<changelog>http://mathias-kettner.com/check_mk_download.html</changelog>
-		<doc>http://mathias-kettner.com/checkmk.html</doc>
-	</upstream>
-</pkgmetadata>
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 39f588773ff2..2a2f600c3378 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -2,9 +2,11 @@ AUX icinga2.initd 2276 BLAKE2B 9573c876cb1fc6ff641d4503d5446840725d94ac2a824cd12
 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.1.tar.gz 2193190 BLAKE2B 29be491c4b43e218ef8aaa2128822040ccb0989e91d83f033cf7873216e4307cdbc8ee9052d79fd22220c396efeb68759acc97938e3ee596e0820e3f6c8f73bc SHA512 1d69a24f85249386e30ff1625cf522ba58e5f2ab641dbe950bf1764324a6c7516d1532942954e842002566823b0f30383747d5ec8b7bd36705aa5f0ccfa29533
+DIST icinga2-2.9.2.tar.gz 2194226 BLAKE2B edf3309711657437439db907f39d9dd04b57ae6b245f4299cfdfc9e8c27d18bdfa704dc5c1459a94d47985103979915a5d2d8594072586cf908e5f8a9d209ee6 SHA512 75a638a37f66a68f47ec161be4bcadbd1ca0e121143528d08d83170209e0b117fa12b1b9a03d1c1550f495bfd0509ca15f4d80be618177f2791b7a1a69308f99
 EBUILD icinga2-2.8.4.ebuild 4604 BLAKE2B 074505319ffdb68d93df79dbfe6c2a88a971b1a188e28526dd97e131d7494e6076173cbe9b8ee3599c7deecb62610f23828f0c107460555d47394d29f81eedbe SHA512 be570d2178c8750227b1dfb46c682a1805696fe9b46241f6ef9f59fa1e6ac9886d7e88cc14bcd5e094cd3671f49dfa1ad91046d3e08288b8266f888fde37a2a1
 EBUILD icinga2-2.9.1-r1.ebuild 4433 BLAKE2B aac55d84d5e6318524227b9477fa895d185d87dae43fabad5c0514580799d13f0f4d7c70bdd302333fb467cfdbfd77096ee99f9b15155d22c65c7c14be56ba5d SHA512 40a3f58a913c481d2e54550e7c9b6186f22542225fa069a06228d31a80868b6472ab7df1f5c5640eabcae9f70add5e3562084d27157505689980c0e8a5598331
 EBUILD icinga2-2.9.1-r2.ebuild 4742 BLAKE2B e16c72fda3de6b45a4f6f3682d683f8e037a3a2f3dbbea136f7c9c2a013892938586d2094cce045a81564046a80a9ba7bfa0f5925b92c3266695a24054235295 SHA512 2201d7a9f01dab71ed53245e9447044d928eb444da952f71aaa366bf27f5e9965e742ea70efd59064ffbc765940445f4b35b7cf5767524379e43a130da0b89fd
 EBUILD icinga2-2.9.1.ebuild 4416 BLAKE2B 0e9e5c307089b8e9feab2ab66468db68e83fd8c7ca54cb4f72dd4405f5ab2879a0a1bb671ddc6abc5638fb2a49cb7f07fc600579889bea1a6fa6540265f7372c SHA512 81ccd2334931c16fed9a5544ace4f8310519c5634437765c7fc9b4ff769def9a7cb717fefb39fc838f7d19f56c5a282f81aad73e8ec5aaa707907266f8d73343
+EBUILD icinga2-2.9.2.ebuild 4739 BLAKE2B 10e76feb6b03018bfdb9409e70c54c6309572eea19bbf57dbadcf6d85ccaea5b93e552d9116ad125adbba79390f6a52d35cc005beea443980739234d51301a59 SHA512 b045c1be0d84f1f7a63a6e8c4a3da4151d50e18d9fc738762efe8a7bc07bf7110c6718b36cc3cf371dfa3184d2a9e01dba58c9964bf6debd0d86f11d76f13b77
 EBUILD icinga2-9999.ebuild 4742 BLAKE2B e16c72fda3de6b45a4f6f3682d683f8e037a3a2f3dbbea136f7c9c2a013892938586d2094cce045a81564046a80a9ba7bfa0f5925b92c3266695a24054235295 SHA512 2201d7a9f01dab71ed53245e9447044d928eb444da952f71aaa366bf27f5e9965e742ea70efd59064ffbc765940445f4b35b7cf5767524379e43a130da0b89fd
 MISC metadata.xml 894 BLAKE2B 45c6d004ea4200544a543c452df876bd89ce3f2143ce5879c671cfc79c31878abb7ce127a350e3149214c3b5b69f5f8a1b75a4c59ac10d7016b4f5023b276646 SHA512 e370c17e46b447f97281616efab16e591b8c6ecfb85896259c2f7cb5ed61a474ccebceaefe5df5eb6885902f518990963324d13b942b3167d73de093499568dd
diff --git a/net-analyzer/icinga2/icinga2-2.9.2.ebuild b/net-analyzer/icinga2/icinga2-2.9.2.ebuild
new file mode 100644
index 000000000000..e5caea793dd7
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.9.2.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+if [[ ${PV} != 9999 ]]; then
+	inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets
+	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+else
+	inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets
+	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
+	EGIT_BRANCH="master"
+	KEYWORDS=""
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="classicui console libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax"
+WX_GTK_VER="3.0"
+
+CDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	>=dev-libs/boost-1.58-r1
+	console? ( dev-libs/libedit )
+	mariadb? ( dev-db/mariadb-connector-c:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	dev-libs/yajl"
+
+DEPEND="
+	${CDEPEND}
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35"
+
+RDEPEND="
+	${CDEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	mail? ( virtual/mailx )
+	classicui? ( net-analyzer/icinga[web] )"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+	enewgroup icinga
+	enewgroup icingacmd
+	enewgroup nagios  # for plugins
+	enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
+}
+
+src_configure() {
+	sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
+	local mycmakeargs=(
+		-DICINGA2_UNITY_BUILD=FALSE
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
+		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+		-DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+		-DICINGA2_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+		-DUSE_SYSTEMD=$(usex systemd ON OFF)
+		-DLOGROTATE_HAS_SU=ON
+	)
+	# default to off if minimal, allow the flags to be set otherwise
+	if use minimal; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=OFF
+			-DICINGA2_WITH_PGSQL=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
+			-DICINGA2_WITH_MYSQL=$(usex mysql ON OFF)
+		)
+	fi
+	# LTO
+	if use lto; then
+		mycmakeargs+=(
+			-DICINGA2_LTO_BUILD=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_LTO_BUILD=OFF
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
+	cd "${BUILDDIR}" || die
+
+	emake DESTDIR="${D}" install
+
+	einstalldocs
+
+	newinitd "${FILESDIR}"/icinga2.initd-2 icinga2
+
+	if use mysql ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+	fi
+	if use mariadb ; then  # same as mysql
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+	fi
+	if use postgres ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
+	fi
+
+	keepdir /etc/icinga2
+	keepdir /var/lib/icinga2/api/zones
+	keepdir /var/lib/icinga2/api/repository
+	keepdir /var/lib/icinga2/api/log
+	keepdir /var/spool/icinga2/perfdata
+
+	rm -r "${D}/var/run" || die "failed to remove /var/run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners root:icinga /etc/icinga2
+	fperms 0750 /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	fowners icinga:icinga /var/spool/icinga2
+	fowners -R icinga:icingacmd /var/lib/icinga2/api
+	fowners icinga:icinga /var/spool/icinga2/perfdata
+	fowners icinga:icingacmd /var/log/icinga2
+
+	fperms ug+rwX,o-rwx /etc/icinga2
+	fperms ug+rwX,o-rwx /var/lib/icinga2
+	fperms ug+rwX,o-rwx /var/spool/icinga2
+	fperms ug+rwX,o-rwx /var/log/icinga2
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "DB IDO schema upgrade may be required required.
+		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+	fi
+}
diff --git a/net-analyzer/monitoring-plugins/Manifest b/net-analyzer/monitoring-plugins/Manifest
index f8536099ebda..7fba0a45897a 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -1,4 +1,5 @@
 AUX define-own-mysql-port-constant.patch 3296 BLAKE2B 7a7c88c6f2c71bc1fc2f802ad202c2d2dbf3ede5af55dbe46cc15a064d37178b27670e30aa7bea07147456ce4d3e1ce9f495fa6df9deb4095367a7427e217719 SHA512 3ead6340800ac15fbe76e223599a5b3dbc6b6b13b72b684919aa43487838564ad7117b4e67fa7f36f0f58554fd8b8d6233efbcb82e6927a0c31f22c6a9ab5dbb
 DIST monitoring-plugins-2.2.tar.gz 2461548 BLAKE2B 0f68b492e089c6dfd09db6aab78ab4490f2e8983677c70dda4c3800a06380c066865587536a44f135d0e314006ed81a757cbfbd918f53e009f9d2c50b8e58db0 SHA512 5f8cfa132891d6d96e69bee3f2c26f7d4546f572be6a18f25ea5d9069f162cb2e424361289a5c26bec60d7b63d28a269437fd6f25645903a1c142fdcbbf77f27
 EBUILD monitoring-plugins-2.2-r2.ebuild 3011 BLAKE2B 3e2fdb8a93f5adad5de4172a7fc4cb5d6afa5ec63dc4221160493b8068361d971650462838dece42d282511c458dc7ef0b4f60b541aa9c422019be5e48a00ec8 SHA512 bdd095ae665410133fd2125ba7b015e75aa57b8a0c35742a172ddb34cf3e71cb7389956aa278f92a3366b3aeb055ba6a579473878975fa7288d9e79f029b78a7
+EBUILD monitoring-plugins-2.2-r3.ebuild 3024 BLAKE2B 88460967e5c1ea7cd7cbc47dd659d8498a31f210cbfb4891615fa71eebad4a820debfafd0f959b8ca539feac40576b95d78d9174ce1db0b5d15af2a7e4809e33 SHA512 5041aa96d3fbdfd5acc781a4f67eac1c7a74a9f928bb1e6f488e476792b711370a46841b7dbdffaba4a28b9177947ebf9ddccd9504e8867227d11aca252a3c31
 MISC metadata.xml 1404 BLAKE2B 68d3a914681db790872872cee7114b053aaa118b9eacbf33b02db932d3b970a80b0fc1d79d9e3f836f7d0f8870066bdf78b6b688864cac753d5ddf42a7ad9f9c SHA512 766657a0c9a0d16fa9fc0c052342b65c1f5b32dbbc0eb4e8fb014274b92dd0370dc19a6821ceed3979a1def5f429e1e3f23ccbf2ca443f787a50e00b503acf42
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r3.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r3.ebuild
new file mode 100644
index 000000000000..52ef5740c27a
--- /dev/null
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r3.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic multilib user
+
+DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu"
+HOMEPAGE="https://www.monitoring-plugins.org/"
+SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres radius samba snmp ssh +ssl"
+
+# Most of the plugins use automagic dependencies, i.e. the plugin will
+# get built if the binary it uses is installed. For example, check_snmp
+# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is
+# installed. End result: most of our runtime dependencies are required
+# at build time as well.
+#
+# REAL_DEPEND contains the dependencies that are actually needed to
+# build. DEPEND contains those plus the automagic dependencies.
+#
+REAL_DEPEND="dev-lang/perl
+	ldap? ( net-nds/openldap )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	ssl? (
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+		gnutls? ( net-libs/gnutls )
+	)
+	radius? ( net-dialup/freeradius-client )"
+
+DEPEND="${REAL_DEPEND}
+	dns? ( net-dns/bind-tools )
+	game? ( games-util/qstat )
+	fping? ( net-analyzer/fping )
+	samba? ( net-fs/samba )
+	ssh? ( net-misc/openssh )
+	snmp? ( dev-perl/Net-SNMP
+			net-analyzer/net-snmp[-minimal] )"
+
+# Basically everything collides with nagios-plugins.
+RDEPEND="${DEPEND}
+	!net-analyzer/nagios-plugins"
+
+# At least one test is interactive.
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/define-own-mysql-port-constant.patch" )
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# Use an array to prevent econf from mangling the ping args.
+	local myconf=()
+
+	if use ssl; then
+		myconf+=( $(use_with !gnutls openssl /usr)
+				  $(use_with gnutls gnutls /usr) )
+	else
+		myconf+=( --without-openssl )
+		myconf+=( --without-gnutls )
+	fi
+
+	# The autodetection for these two commands can hang if localhost is
+	# down or ICMP traffic is filtered. Bug #468296.
+	myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" )
+
+	if use ipv6; then
+		myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" )
+	fi
+
+	econf \
+		$(use_with mysql) \
+		$(use_with ipv6) \
+		$(use_with ldap) \
+		$(use_with postgres pgsql /usr) \
+		$(use_with radius) \
+		"${myconf[@]}" \
+		--libexecdir="/usr/$(get_libdir)/nagios/plugins" \
+		--sysconfdir="/etc/nagios"
+}
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \
+		NEWS README REQUIREMENTS SUPPORT THANKS )
+
+pkg_preinst() {
+	enewgroup nagios
+	enewuser nagios -1 /bin/bash /var/nagios/home nagios
+}
+
+pkg_postinst() {
+	elog "This ebuild has a number of USE flags that determine what you"
+	elog "are able to monitor. Depending on what you want to monitor, some"
+	elog "or all of these USE flags need to be set."
+	elog
+	elog "The plugins are installed in ${EROOT%/}/usr/$(get_libdir)/nagios/plugins"
+}
diff --git a/net-analyzer/nagios-check_openvpn-simple/Manifest b/net-analyzer/nagios-check_openvpn-simple/Manifest
deleted file mode 100644
index a81b9e9301a6..000000000000
--- a/net-analyzer/nagios-check_openvpn-simple/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST check_openvpn-simple-0.0.1.tar.gz 13597 BLAKE2B 8cf1bdb19e08d2f6ccbf1d74d2a3e6679344d3dada493bc32a41a3fe9fc7fc500136fa4949096c8afdbdae120ec6d2b6e3b109b8a8a1439796bfbbeb17b1d4a0 SHA512 186575e4de4fd5f27f9701b5e5a56d8b6eae454bfefd8b13e6cbcee9da795833a567fc7a4fc5331a1498f6c0428599f0ec895acecb410e95e37ed43df58abc8f
-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/metadata.xml b/net-analyzer/nagios-check_openvpn-simple/metadata.xml
deleted file mode 100644
index 45125b9b6e99..000000000000
--- a/net-analyzer/nagios-check_openvpn-simple/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>mjo@gentoo.org</email>
-    <name>Michael Orlitzky</name>
-  </maintainer>
-</pkgmetadata>
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
deleted file mode 100644
index c7b69cf87e78..000000000000
--- a/net-analyzer/nagios-check_openvpn-simple/nagios-check_openvpn-simple-0.0.1-r1.ebuild
+++ /dev/null
@@ -1,39 +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,3_5,3_6} )
-inherit distutils-r1
-
-MY_PN="${PN/nagios-/}"
-MY_P="${P/nagios-/}"
-DESCRIPTION="A Nagios plugin to check whether an OpenVPN server is alive"
-HOMEPAGE="http://michael.orlitzky.com/code/${MY_PN}.php"
-SRC_URI="http://michael.orlitzky.com/code/releases/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_install() {
-	distutils-r1_src_install
-
-	local nagiosplugindir="/usr/$(get_libdir)/nagios/plugins"
-	dodir "${nagiosplugindir}"
-
-	# Create a symlink from the nagios plugin directory to the /usr/bin
-	# location. The "binary" in /usr/bin should also be a symlink, since
-	# the python machinery allows the user to switch out the
-	# interpreter. We don't want to mess with any of that, so we just
-	# point to whatever the system would use if the user executed
-	# ${MY_PN}.
-	#
-	# The relative symlink is preferred so that if the package is
-	# installed e.g. while in a chroot, the symlink will never point
-	# outside of that chroot.
-	#
-	dosym "../../../bin/${MY_PN}" "${nagiosplugindir}/${MY_PN}"
-}
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index c4bd449450d8..374495ec126f 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -3,4 +3,5 @@ DIST nagios-plugins-2.0.3.tar.gz 2659772 BLAKE2B d4deccf04458daccde5fbe7e6c65928
 DIST nagios-plugins-2.2.1.tar.gz 2728818 BLAKE2B ea89862935491d9c31403a36712d39557fa8e90dc2306e027531e974933cd13cc6b55ebfdd7dfc7541d6458741aaf57714df57fdddc92049001a59f0ffb6413a SHA512 6ffe313a56a305b382f62abc0f0958d7078f9050e1340f30721d6e6f71944b57b1650e90e6835c35dd7c9f3f4b4cee9f235b8382b0811db30b3729daaafc9bc3
 EBUILD nagios-plugins-2.0.3-r2.ebuild 2828 BLAKE2B 2581655bd322f74c6253811b6a10de420c5f1c90677d87d5f344f4939d45b00d394fe8b026b44ed9bf76024d18ef67d4f7ab222e6fa75e72d88e7c4f44eae94a SHA512 cabe19f142006c4d104721361c2c58fc7a103717041050a21bc21b47adb6702bf05c77f1ed8b063f74b11a59a2dd1120d8478e5b1d803636aeb9f1ae92c2ae91
 EBUILD nagios-plugins-2.2.1-r2.ebuild 3109 BLAKE2B fb9958b01df2993cf3f2f95c50996f94b30e9238a39e116dd857255c60bb4d516781171041d8070a50ffc7526766d24b0331c4f93302d875e17775043b4f84ab SHA512 a7080b7c27013958a97a9125ba11bfa93be6402dbe8a8667b80f236bf3364e994b44815bb6ace6e24e08a0f9c0f90f96f47ca2d71403152c444b4b5afd064249
+EBUILD nagios-plugins-2.2.1-r3.ebuild 3126 BLAKE2B 21e3131fb9dcdeaffd3779dd8d247e15c88228956abfeb33ac39b9d8a9d42d1d734d8a9a7b7a08a91f622975c799fbe29045aaef69cfac24d59ce60a5f9b3109 SHA512 d60932357aca2aa80533314ef6db485b634aa1a1fb8419a8d4c68a1ed518ceb663b90a875eb9b1c8e51ec5bda585108bdf7f31c9f8f67a9381710e2dd2dab50f
 MISC metadata.xml 1430 BLAKE2B 63a889dc51085a41a5dec4b6c32e6262ff59fdb1413699736d6332a75406749551b1c82d62a2662f4d7935c46a4bc3b51e0ca7e3b070656163fb0b6fc69c742e SHA512 d6cbc6820de52e1ed471b97a6c592af72474db492204594314eebb656b8abe89a01667a7bbb621418fd393aeacb28e9a10c5749de7ace67dd15119f701019e72
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r3.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r3.ebuild
new file mode 100644
index 000000000000..6c36a0214b5b
--- /dev/null
+++ b/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r3.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="Official plugins for Nagios"
+HOMEPAGE="http://nagios-plugins.org/"
+SRC_URI="http://nagios-plugins.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 ldap libressl mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl"
+
+# Most of the plugins use automagic dependencies, i.e. the plugin will
+# get built if the binary it uses is installed. For example, check_snmp
+# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is
+# installed. End result: most of our runtime dependencies are required
+# at build time as well.
+#
+# REAL_DEPEND contains the dependencies that are actually needed to
+# build. DEPEND contains those plus the automagic dependencies.
+#
+REAL_DEPEND="dev-lang/perl
+	ldap? ( net-nds/openldap )
+	mysql? ( dev-db/mysql-connector-c )
+	postgres? ( dev-db/postgresql:* )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	radius? ( net-dialup/freeradius-client )"
+
+DEPEND="${REAL_DEPEND}
+	nagios-dns? ( net-dns/bind-tools )
+	nagios-game? ( games-util/qstat )
+	nagios-ping? ( net-analyzer/fping )
+	samba? ( net-fs/samba )
+	ssh? ( net-misc/openssh )
+	snmp? ( dev-perl/Net-SNMP
+			net-analyzer/net-snmp[-minimal] )"
+
+# Basically everything collides with nagios-plugins.
+RDEPEND="${DEPEND}
+	!net-analyzer/monitoring-plugins
+	selinux? ( sec-policy/selinux-nagios )"
+
+# At least one test is interactive.
+RESTRICT="test"
+
+DOCS=(
+	ACKNOWLEDGEMENTS
+	AUTHORS
+	CODING
+	ChangeLog
+	FAQ
+	NEWS
+	README
+	REQUIREMENTS
+	SUPPORT
+	THANKS
+)
+
+PATCHES=( "${FILESDIR}/define-own-mysql-port-constant.patch" )
+
+src_prepare() {
+	default
+
+	# Fix the path to our perl interpreter
+	sed -i -e "1s:/usr/local/bin/perl:/usr/bin/perl:" \
+		"${S}"/plugins-scripts/*.pl \
+		|| die 'failed to fix perl interpreter path'
+}
+
+src_configure() {
+	# Use an array to prevent econf from mangling the ping args.
+	local myconf=()
+
+	if use ssl; then
+		myconf+=( $(use_with ssl openssl /usr) )
+	else
+		myconf+=( --without-openssl )
+		myconf+=( --without-gnutls )
+	fi
+
+	# The autodetection for these two commands can hang if localhost is
+	# down or ICMP traffic is filtered. Bug #468296.
+	myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" )
+
+	if use ipv6; then
+		myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" )
+	fi
+
+	econf \
+		$(use_with mysql) \
+		$(use_with ipv6) \
+		$(use_with ldap) \
+		$(use_with postgres pgsql /usr) \
+		$(use_with radius) \
+		"${myconf[@]}" \
+		--libexecdir="/usr/$(get_libdir)/nagios/plugins" \
+		--sysconfdir="/etc/nagios"
+}
+
+pkg_preinst() {
+	enewgroup nagios
+	enewuser nagios -1 /bin/bash /var/nagios/home nagios
+}
+
+pkg_postinst() {
+	elog "This ebuild has a number of USE flags that determine what you"
+	elog "are able to monitor. Depending on what you want to monitor, some"
+	elog "or all of these USE flags need to be set."
+	elog
+	elog "The plugins are installed in ${ROOT}usr/$(get_libdir)/nagios/plugins"
+}
diff --git a/net-analyzer/ndoutils/Manifest b/net-analyzer/ndoutils/Manifest
index e1b70c471bb6..635368bd8eda 100644
--- a/net-analyzer/ndoutils/Manifest
+++ b/net-analyzer/ndoutils/Manifest
@@ -3,5 +3,5 @@ AUX ndoutils-2.0.0-asprintf.patch 438 BLAKE2B 2d32a25467123281f8593b464362a66345
 AUX openrc-init.patch 3296 BLAKE2B f07c1c0fda7a0d2e1c3f2b9cbae60568f743d82454179bcb3ee367d8a022a406dd1bf0c775fc9b339524cc5c64e4af6aacb8df8a866809104e39f39d11531f26 SHA512 4beb0e72712909554deaa93aa3fe959e80bed3465f4f0a2153f8b4e994538e6d508e303451cc14425ecb5210845308e9a113f491900a977526327a2701b00eb7
 AUX sample-config-piddir.patch 1098 BLAKE2B 467fab110ef030010acf8e130d91ba1f97424c611ef75ed0a7806d5034f1c8a5ecce2c64832a295347fb3e323342f3afc5f5d1fbbc3584f26bd2f3b226cbf3af SHA512 bae06d6571aa55c5b9f0103d9af861f50b31668f06dc9b9a29cdf961741455384d8c762338dbfb3c75e10bacba360ac5a706b6251a6ef5cec8fa0def4c679344
 DIST ndoutils-2.1.3.tar.gz 2182999 BLAKE2B 390548b9018d4434d5d0f69abee1d1a11f4e240150941f7f2f9e2662eb2cdb2f29b24244e094d5bdf8bfaf6c3be7bc8ebd9e6d510d66edad8bc9cf3245d5c2c3 SHA512 727f2051876ff32cafaf9993a69b721ae4ea81031fade12262dbb4c5399c601f3c1af362d9d550e1d6d56fac8fe044d515dc10fc43e7d4d3e981bc9a89db88de
-EBUILD ndoutils-2.1.3.ebuild 2430 BLAKE2B 6d430bcdb417779f50df2535338d2bd95fae9161caa22af641d3e0dfcef7c887606266971f4334b06ea1ecdf95e4380329173e17aece4a7cd79ed1342c36293b SHA512 e89a8ce44cca00eabf5e4c7234f39531c95543f13051db9e7108deed694af912567cb0a885a287d1fa33975943e5410c2ac0c1ea9014c855ea3e8cc54411f621
+EBUILD ndoutils-2.1.3-r1.ebuild 2559 BLAKE2B d651e46dd9c99463824cc094c413e9bdd538dd4f11253da5aecb94297ba84cb26e312e8e910216323ce0e4c157221551fe79b0b6460bfe0a5ad40b9b633267c1 SHA512 16ba80a071e13db8d916da7bdb5e727c81d24ac0bc51d7991450f12ca18a632e1e6f5aa4f2905229f994941194e146587536ae516bb5da849f0e92a56983e39c
 MISC metadata.xml 446 BLAKE2B fa3dd9d02ff6fc6a6b973fc1a08e0402a7a024ee783d7d9eb86e6dbc5756ebf62942f87115e45997779fe9393d6a6df91f8a92ace9f6be38bbfda00b8951f06d SHA512 744e2dc2da0449a47d7acc67820a5627058f7e962f9b78beabc766936abb8a5a8c55d4bd01f239af9d63b418e36d875e30f591bf6ab694fc171c7387eb1c1c77
diff --git a/net-analyzer/ndoutils/ndoutils-2.1.3.ebuild b/net-analyzer/ndoutils/ndoutils-2.1.3-r1.ebuild
index 1872b7849d8d..57a0389779bc 100644
--- a/net-analyzer/ndoutils/ndoutils-2.1.3.ebuild
+++ b/net-analyzer/ndoutils/ndoutils-2.1.3-r1.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
@@ -14,11 +14,12 @@ KEYWORDS="~amd64 ~ppc ~x86"
 
 # We require the "nagios" user from net-analyzer/nagios-core at build
 # time.
-DEPEND="dev-perl/DBD-mysql
+DEPEND="dev-db/mysql-connector-c
+	dev-perl/DBD-mysql
 	dev-perl/DBI
-	>=net-analyzer/nagios-core-4
+	>=net-analyzer/nagios-core-4"
+RDEPEND="${DEPEND}
 	virtual/mysql"
-RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-${P}"
 
@@ -74,12 +75,17 @@ src_install() {
 	# The documentation isn't installed by the build system
 	dodoc -r docs/html
 
-	# Use symlinks because the installdb/upgradedb scripts use relative
-	# paths to the SQL queries.
 	insinto "/usr/share/${PN}"
 	doins -r db
-	dosym "/usr/share/${PN}/db/installdb" /usr/bin/ndoutils-installdb
-	dosym "/usr/share/${PN}/db/upgradedb" /usr/bin/ndoutils-upgradedb
+
+	# These need to be executable...
+	exeinto "/usr/share/${PN}/db"
+	doexe db/{installdb,prepsql,upgradedb}
+
+	# Use symlinks because the installdb/upgradedb scripts use relative
+	# paths to the SQL queries.
+	dosym "../share/${PN}/db/installdb" /usr/bin/ndoutils-installdb
+	dosym "../share/${PN}/db/upgradedb" /usr/bin/ndoutils-upgradedb
 }
 
 pkg_postinst() {
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index 54f1965b3ecc..9de76ea2f52b 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,4 +1,4 @@
 DIST netdata-1.10.0.tar.gz 2611773 BLAKE2B ffc4bfa593e4a36785c7e09709f1063598bd337016ad858e435049c5821f44fd5f048e4e7874e06d67c7e59234f6ec67a8a50fc7573f6b2f0cd768770ee2a612 SHA512 2358db818ad7d1ef6298c25d3f9d6c5a5a850f5bbe033b82cca1f3bc154055523637691417b6f2c2d4b7273b575afa0ec13e203ea7c2dd6321088a078ef05017
 EBUILD netdata-1.10.0-r1.ebuild 2541 BLAKE2B 70123767be2cbdf1d90dcb05a44a7c34cee223ce00a2b9aa803d5e8c242a638f05be593c4ad382ecc93fb5cc7db443984ae1777adf032da40ca336b4ae4d07ca SHA512 531ceafb0dc2b8988a5af2c1c3c42298bb009d5ae022619cee1940c67fa7b117f5b5fb495ac02adfad61e93729db5908e1b869c114130835d5027fe519faddba
-EBUILD netdata-9999.ebuild 2541 BLAKE2B 70123767be2cbdf1d90dcb05a44a7c34cee223ce00a2b9aa803d5e8c242a638f05be593c4ad382ecc93fb5cc7db443984ae1777adf032da40ca336b4ae4d07ca SHA512 531ceafb0dc2b8988a5af2c1c3c42298bb009d5ae022619cee1940c67fa7b117f5b5fb495ac02adfad61e93729db5908e1b869c114130835d5027fe519faddba
+EBUILD netdata-9999.ebuild 2568 BLAKE2B 7071f11cd6b46ef2d7ab16b872fe35b0669b266e54732651f998b7c3df89e46b6cf0d9f40d69fddf0c0185235ed5d7fa883b52171c7fab18b2f1c3e9f5a00241 SHA512 173479d6af1473dec65c54b05dc2aa2a95c8e6234c7612fa9003eb2e4c74a5e714e49fa42a3fa6fb3e702a3731611b68ab6d7343caa88d931b3f28dc11ae0cc5
 MISC metadata.xml 807 BLAKE2B fa551c2d00268159e7bbd6e3c4a37d29a68ce7ceb1d5390a8e55571c24046f74fa1f464b8a9dd54fac2aaf7a71289e2ce05e006e2de904262f0cc283dc9d4c27 SHA512 bc6d35a5d9f28c8bf6fc9ccee126f4db6c22c915ee75c45ff0e898e712f8a7277f3d6fb22024a76d624e34609dbab9a36cfff696626eec9de84fadd361d8410d
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
index d22fa18925fe..f781f2a51517 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,6 +27,7 @@ REQUIRED_USE="
 RDEPEND="
 	>=app-shells/bash-4:0
 	|| (
+		net-analyzer/openbsd-netcat
 		net-analyzer/netcat6
 		net-analyzer/netcat
 	)
diff --git a/net-analyzer/nmbscan/Manifest b/net-analyzer/nmbscan/Manifest
index 40058cfa4607..1d4e61d09540 100644
--- a/net-analyzer/nmbscan/Manifest
+++ b/net-analyzer/nmbscan/Manifest
@@ -1,5 +1,4 @@
 AUX nmbscan-1.2.5-head.diff 442 BLAKE2B e97b6359f9479b76eae7cddc837df06a02b5adf886ee142f5e0b6dfe27debda30d49197c0184e802686d00df510ed0f6a47ea90c294ee1e124fb980b379121e9 SHA512 6fd79b7b9462700245df3c91345a197cbadafb30f60737b2426285f9a4bff969c752bd68bdde4f305cdd8079a5c89fa1be75360a2e35caf495489c01081b0ceb
 DIST nmbscan-1.2.5.tar.gz 44749 BLAKE2B be49afa46c6ed1533f3e3d7b5c6fbe54b83802385ed9b670f1cdc0105eae99135000be5e98a693ad2adca54f9948ebacc8cd4fc677828a61a5fa85667d584fcd SHA512 37030c6759cc8b257356274b54ec7474e49ddc523be20180c509064f9238da3350f0f0e73e84f2e89201405e93a350a7a7cdc24ef890e638b62648ee2fc4feb9
-EBUILD nmbscan-1.2.5-r1.ebuild 567 BLAKE2B a3b7757cc183eab88a490c5b988c9dad46f1d200c50ba2a5551a0050afc97f932f3b7fc4dc5eb3e0016174c84a835a7149b80a30c63224aa2e3ce1a195cf7b65 SHA512 bb6787ef6d3fcf1e6b2ec656cf5870b0745f6cf317c2fef39733894d73266601b3362b684ec1fe23e7d6cc9269b069229799b1f84a23af21fcc06691fe73d1f7
-EBUILD nmbscan-1.2.5.ebuild 707 BLAKE2B 95ee73d14528ba7677d919ba46735bcd86e8aa94b4be89825e5fa0ba3fb828e42e6919807c4803abd4001397f8f67daf91fc47294791ae26329e506f192d4bbf SHA512 062ba8f53abd087691a76ba07e1ec71d9c5c2077a801792800ee9971d15f6350eae52ab9108b393c44d64ee014f67e54f48023d389baa86947401870cea1947f
+EBUILD nmbscan-1.2.5-r1.ebuild 560 BLAKE2B 34984ad2f4247700faef22e15f49e78950e40c4c0f6481a95b0b24344ff6e19de9cd0c5d14512c1ac32d837ec5b8f9fe629853d2d5717ceb953d448aec5da04c SHA512 6ac78a6009bbd489436f97776e435ba73e58e477d795a461780b9bb110a7f5c3e81d35aa4578a36b76d0ba77604d7e436cfeeeaf13cf7d25879725a817786616
 MISC metadata.xml 683 BLAKE2B 8a9b8ad3c95bf0889477f9f8bb0a5f150f24e6d1cdc796a870c8f315497c1383c585b51b18c43dbf2f66122cd0db332c4f10da05ec62647573ba02fe2b450f16 SHA512 f0bb01d9be906681f1e7bf349e776b7cfc15a61be7a3e944e7291dac9f42a3fe151b05e20c6a13b98c8bad598d56811699a8365ba9227419bea4e2373de26b19
diff --git a/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild b/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild
index ca165970fada..85b5ba140bc1 100644
--- a/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild
+++ b/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://nmbscan.g76r.eu/down/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ppc64 s390 ~sparc x86"
 
 RDEPEND="net-dns/bind-tools
 	net-fs/samba
diff --git a/net-analyzer/nmbscan/nmbscan-1.2.5.ebuild b/net-analyzer/nmbscan/nmbscan-1.2.5.ebuild
deleted file mode 100644
index 55bcd35032e7..000000000000
--- a/net-analyzer/nmbscan/nmbscan-1.2.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="Scans the shares of a SMB/NetBIOS network"
-HOMEPAGE="http://nmbscan.g76r.eu/"
-SRC_URI="http://nmbscan.g76r.eu/down/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 s390 sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-shells/bash
-	net-dns/bind-tools
-	net-fs/samba
-	net-misc/iputils
-	sys-apps/coreutils
-	virtual/awk
-	sys-apps/grep
-	sys-apps/net-tools
-	sys-apps/sed"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-head.diff || die
-}
-
-src_configure() {
-	return
-}
-
-src_compile() {
-	return
-}
-
-src_install() {
-	dobin nmbscan || die
-}
diff --git a/net-analyzer/pypacker/Manifest b/net-analyzer/pypacker/Manifest
index 17662595669b..3492fee01b0c 100644
--- a/net-analyzer/pypacker/Manifest
+++ b/net-analyzer/pypacker/Manifest
@@ -1,3 +1,5 @@
 DIST pypacker-2.9.tar.gz 276080 BLAKE2B 3bab4b4c7879fea10accbd3fb2bcb4a8e27096a29240f6b8e4e06c3486ee0cb2b8fa1e83674dee759fafc85c2e182cb75e836c00dfe28c83c0bb2cecaed758cd SHA512 b7ca61948a55a37661fa402ebc5a9c2be456e8df14d1ee091a50ccd1362c7a7fa9224e1ae2b8ee8057f302ee9e0c61c06d07b627dde92947f8d22158ef3623b8
+DIST pypacker-4.6.tar.gz 592362 BLAKE2B 41fc63f1fc40ab1cfc007db9dfc6d18cedb51cc8525dc2b467bc03babe03c49f9f0771b8146aacf80f74c511619da85e1f7d56667bcda350710e4c0bafb89351 SHA512 c55205b35f653903149517aad0e2d055745edd6c1a28b1b49aeaa435ca327693b20ed6f851011fa80df1fcc5281ac8b92fbffa3b1381cb3d4507ef7d45d49545
 EBUILD pypacker-2.9.ebuild 701 BLAKE2B 16a0ffa73034e84801260a4a8cbed76ea81331d8aeb8e8a3744b77bfbf74ebeea8e0bfb881e97371eb869321fb87d115ecbfea343786210ef2ba4c6dfc634d47 SHA512 6dcbe72212bc1f9308b07476a18b86097223ccd0931769c8004568f4063d3f857529c224f7d49471a093cb20f65a0b9a022bdbdc5f9664afeb9ccacb5350d01a
+EBUILD pypacker-4.6.ebuild 698 BLAKE2B 67701c48430b6cdbe24d4a7df926b9c9a1d80133ad51ea34167bce2b232eb8767c92c5781f4a09d3c3262f942eeebd7d325edb17d6c90a38c92f6439551b4d24 SHA512 f441b89db0edef1280fc07af26b785ec564c34958d2b21d307b8677387ee977d4710567833834723993f514dbf0acd9c8ef20941ee4f07a7c8f33a73c56260b3
 MISC metadata.xml 471 BLAKE2B 16f24ca5a8c373e40115c441da2b6efabca5ebf7f6cd5d4e55c64320172d92470e34c484c7c9d63dce8f4fcf1aff0a0adc0d0743807cd342756aabfe790b4356 SHA512 8eda90dced7132f754ceccf39fbd1b7fdce0ff01490987eb6c6258544dcac27ba03313cb401396e0014c0fff42133da53698681ad5ac48d0f29bead5786abe2f
diff --git a/net-analyzer/pypacker/pypacker-4.6.ebuild b/net-analyzer/pypacker/pypacker-4.6.ebuild
new file mode 100644
index 000000000000..03473c1ed8f2
--- /dev/null
+++ b/net-analyzer/pypacker/pypacker-4.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Fast and simple packet creation and parsing library for Python"
+HOMEPAGE="https://gitlab.com/mike01/pypacker"
+SRC_URI="${HOMEPAGE}/-/archive/v${PV}/pypacker-v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( AUTHORS CHANGES HACKING README.md )
+
+python_test() {
+	"${PYTHON}" tests/test_pypacker.py || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	use examples && dodoc -r examples
+}
diff --git a/net-analyzer/traceroute/Manifest b/net-analyzer/traceroute/Manifest
index 3fb086a7c3f1..964050b2e00f 100644
--- a/net-analyzer/traceroute/Manifest
+++ b/net-analyzer/traceroute/Manifest
@@ -3,5 +3,5 @@ DIST traceroute-2.0.22.tar.gz 69001 BLAKE2B 8678bf2636b3a0615e7282923ccfeae9c721
 DIST traceroute-2.1.0.tar.gz 71460 BLAKE2B 4c2126fa98625d525d0a1b0075d16a6ff37836e18d2ce8319f58c89bfa22a6a5e3bbe2ded22fa98d5128c7bb58578327db08120a5b78c1c4ff5673dcc0dea7e6 SHA512 3578007c734091ea0c906637c03fd133a8b0154fbf2e6b5c0c881184947918196bc03aeaf872d3bd53777b9b771cba5cf97f73fb5916bb53b75037f429b40ed3
 EBUILD traceroute-2.0.20.ebuild 937 BLAKE2B c725daf3511d8d24b2e3a49942944595529245483bcb981457911be9c6216dd1baaa3a13ef2bbb78c9647d6e232d3829e31739880cdff65666ea00f935f3fddc SHA512 7bdeef7eedc93e792e57e8c09d256e55bc0b7f9216035d174da66523119e57ae71eb5f9b8805a4421b0910a0a658c2412053f67999ed34d140e2b9d3c2a9cb5f
 EBUILD traceroute-2.0.22.ebuild 888 BLAKE2B af947b2e99b1d4d6ea9996c40b3aded90699a04583ee9fc56714650df3762812e7c7628ca611ded9f2d694fa30240ae9b8a03a85bf4fe574396597c0351b2fad SHA512 0c299339fa16328123c82428f339cb7b1b1ffb528d76fbe0795f10035eb4520c507901c67c32a68e08cf2d221dad56b68cb239f9dbecb99611c28f90f77a094c
-EBUILD traceroute-2.1.0.ebuild 886 BLAKE2B 52feca954820f9821cc4044e4a31f5630f4b355be00698a6524bd33ba34c681d19ba0d60d6eae778f42d0e84edf6460b76998364b82f111c84e9a4415b6f668b SHA512 160241c581f52cfbf4cd80635f50c30042f88fea9a1329ecd5c58866788de88c67551089b92b3c85d3aac126573a16c1f57c7de51627c902f92a7fea0471b70e
+EBUILD traceroute-2.1.0.ebuild 884 BLAKE2B 74ab7b53d45f0243aa861b34a1a5cd6bc2a044164d1c07d65197b07bcfcf752655c6c91c278f27afcb041772457298e8f71e5cf950e9ebf5abc9dd7a5453fa8a SHA512 2826f659286d4c032827750627b5b9bad96cceb708a520671873d69f1dff6b8553f332594318bc8b8710fce22c4e63826fc98ae517cd5b55cd933a52070e11a1
 MISC metadata.xml 437 BLAKE2B bbef3a65676e67e78b4f78846a46986a3ffc8b74bb73517795b4796b2865ee0ae4d6ecf99edb1a9b12dc97988cc51fb161dfb757e8ef449a3b46fa1eac5c8411 SHA512 928cbbbcefe88681f5f797616d8f8b4de75cf789157afa536a757e7e72f44b07c337105380816aa79713ec143c324ae16577351648357a77267b6625b962924d
diff --git a/net-analyzer/traceroute/traceroute-2.1.0.ebuild b/net-analyzer/traceroute/traceroute-2.1.0.ebuild
index b3ecb43d34c8..59d723a8fac2 100644
--- a/net-analyzer/traceroute/traceroute-2.1.0.ebuild
+++ b/net-analyzer/traceroute/traceroute-2.1.0.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/traceroute/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static"
 
 RDEPEND="!<net-misc/iputils-20121221-r1
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 3f4be0ac4be7..43ccf9bc9b2d 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -28,20 +28,24 @@ DIST zabbix-2.2.23.tar.gz 15504361 BLAKE2B c0eec293a92564607ed56c570aca30385481c
 DIST zabbix-3.0.19.tar.gz 15642128 BLAKE2B b9b84f21371db1eb8efdfb547e2b4a9216e9fb3c76fe54420ab1c76bad5cbf4537f6f0aca720748d39fb2ebf0447c3f82bf9e0d276f9fa4c9e91bc70e8b67f22 SHA512 30239db9236f536325f0ad3a8ea08abd8c460caf60dfd80b881cc9532d2f65d6154e8911be89d141539f7eeced359809405cf1b655eafdab1b940c314c8d3132
 DIST zabbix-3.0.20.tar.gz 15653766 BLAKE2B 4c36611e6fa26f9f5a8e3201eea0f08f3c2945542284be0a823751ad39f51deffc450e1994bc685c6179d7e72bd3dd58e0071071cd02446d6d733cddf8d7f916 SHA512 06832600f31f13781b42083a56b8bca18f6a2034b6641b6809e338e374fa08dabbae6c9d54ee711b3dd2ac5017203fea3e0cbf7f70a1a1da60dda43c7e1af00c
 DIST zabbix-3.0.21.tar.gz 15658030 BLAKE2B 8a943f015ba137c7a161439a31d09bf023bd02bf6ad420c8b02f316adedccf3b23df3775ecea7b27c5b4c893e881f2689cab1c28a4e6c1fe5b79ec08d5d86f43 SHA512 bffe02dac6f009ba8929e0d9ba222ae4bb9da05550f9eaff034fe444ee1c866bd231bb8aa814b7dedc01a5338171b40d461567a7bf619bfccfc523362db579a1
+DIST zabbix-3.0.22.tar.gz 15669417 BLAKE2B bef6a757324e68d61df8d892c94853ae7044cd66442cfaf2356e6f855af5d177b583aceaed14c31beb0c82e4134d089bfd7c4847c68e2c739f4e9e09a6cfb278 SHA512 fba82d22560c2aa1025b7d89a6ef50a02bda4c7f2408572f1b9624e8a703a798bf3188f9e8def261e564b8e74e63d4a5973e50f93d49058429d51b9699d110a8
 DIST zabbix-3.2.11.tar.gz 16099820 BLAKE2B 7038679ecc9ae1b6684d65b3dd0019865e587c82e5a3ffe55610c057f8516ebe34978101065ac31628e6fd54077877c447d64cb1d169e0ad7402e727c7e65d76 SHA512 a14e0af4b183c8deb524c8965700c2988c0c131844f7fbc748aa8d1703b9dad73c2cf6d77663799fbd455adf58fdd1ce8dc5fd6404a9269c1a42160ad0e33e6e
 DIST zabbix-3.4.10.tar.gz 17300622 BLAKE2B 1b4c275d271ae4d4607400cb6e5f955ba624bf19cd116728e7a71a1b4adc0fbbde8cf91e6b0a71c5d48bf5c38b2ebe0db79f00ba3a42cc4213a0e310d56d5e29 SHA512 25e85cbe7a93a088fa0132ed6f3f75ad1aadedb839d745be38e180f0f9b858e32045b9d057b10cab4d3a8aa770b22b631aa0894fe5f1c3ca4ca62a000934bf94
 DIST zabbix-3.4.11.tar.gz 17517171 BLAKE2B 72f7d1cad3e8cb7972cb9c3698d35f70c45de1244c14a87f403a0c2c9b1825d679fa32e54dc4b2aae80a24acb7723ce489e0d409fb027c1afc8bb4eccecf9867 SHA512 1360e1de02fbbda30539e0f1dbe9d4aee57bc693f597db011cdefe7e7c4acaa6e3452813ee29e0e614794336e7fc9210ff3458f3761fcec90db66fb4a2275373
 DIST zabbix-3.4.12.tar.gz 17509251 BLAKE2B 158c7b3061059cc54a5988296404ed6670ca872fa8fa55f8de9708871ee03f163d0365420e23ef5df89a0a85e2f23d607952cf4fc02c974037555534ca164f08 SHA512 6707ff5a15d2c139775b4b5de32ceb4982c90aa4023af310ab9cb849895387984d32f59b7dc9fbaff8f317a630238437e4651ab8272b4535fb5fc3d88750e3ef
 DIST zabbix-3.4.13.tar.gz 17507365 BLAKE2B a5d1fa1a48df2ad66b844c2c85038a088ea5f7e3e67c2c3ab5f5d1ad695b3a31664d317e6a1cbf64d1f6a211304f50e5c38f5d973d4607f2caa202e1184420cf SHA512 4edcf6d9df0f100c639efa6bc18e67ed59819e719a2226593fd81212d4c2e46a19cb50501cca005246b4c01c4082a18e21c9049a99ac9df263180a3c24fa52f0
+DIST zabbix-3.4.14.tar.gz 17476022 BLAKE2B 9fccdf69bb74379fccfe044d68da8ce458e04c4686ae70a2fed5523309196b13fb022daa00d47ae9eb97a0774942efd766858dfe94890e20f38808ef2a3e3d15 SHA512 597ae107c16578ec2b1a364f2b61a7a7423a1cf39d3b04289e2f91dc0f931e796b566cbd451b14e026c35302120b647d6d574952a453189b066fb06081f9bb83
 EBUILD zabbix-2.2.16.ebuild 9436 BLAKE2B 3d7e32e772074500827d0bd469e280f77a4f7319ada11d1556bfa3148d0a25e6b00b84d604ac0cca436d375cabfe9cb145c5e51902c8293668135396d1dfc160 SHA512 c244b2dcff1fc7a1e7dc82c254eef974a4153f3f4bdf1b202d50e3006de3e0237d4dcc587ee66ffcbc16bb39ee4ad29a4dfe283332a3593aba2585f5c970d563
 EBUILD zabbix-2.2.21.ebuild 9438 BLAKE2B 2032d57e9e5dec45250fba571414aa22b896ecd3f13d42d04b86f0392f153e2cfdc9097cac3b983a331dabd03bcde7b74685139879114bd361a15449bd850123 SHA512 dcda14cad8ea47a09853f5768fb9f538a8150a0fc1da33350ab7d77e161fa85b3719dfcac9515b461815d7c710da7b2ca5ff24db7b7a05a26edeceb00931944d
 EBUILD zabbix-2.2.23.ebuild 9438 BLAKE2B 2032d57e9e5dec45250fba571414aa22b896ecd3f13d42d04b86f0392f153e2cfdc9097cac3b983a331dabd03bcde7b74685139879114bd361a15449bd850123 SHA512 dcda14cad8ea47a09853f5768fb9f538a8150a0fc1da33350ab7d77e161fa85b3719dfcac9515b461815d7c710da7b2ca5ff24db7b7a05a26edeceb00931944d
 EBUILD zabbix-3.0.19.ebuild 9278 BLAKE2B 6e5e42556fbd612fb7060a205bd5a4e12d13db91c6ac5ac0a0724e3462dbab5657db6992f7e5b8d746a91fc2b8ee1cdb2d0c8e982b57b14a141877318dbfcc0e SHA512 7219c5535aa5d91be8132fd74bb7fc7eee2dda0fedc761c031518c0b7b86ec97dee74a03a444979ae2f556e9de252f339e88b337fbedf6efc1a5d97fcefea04c
 EBUILD zabbix-3.0.20.ebuild 9278 BLAKE2B 6e5e42556fbd612fb7060a205bd5a4e12d13db91c6ac5ac0a0724e3462dbab5657db6992f7e5b8d746a91fc2b8ee1cdb2d0c8e982b57b14a141877318dbfcc0e SHA512 7219c5535aa5d91be8132fd74bb7fc7eee2dda0fedc761c031518c0b7b86ec97dee74a03a444979ae2f556e9de252f339e88b337fbedf6efc1a5d97fcefea04c
 EBUILD zabbix-3.0.21.ebuild 9278 BLAKE2B 6e5e42556fbd612fb7060a205bd5a4e12d13db91c6ac5ac0a0724e3462dbab5657db6992f7e5b8d746a91fc2b8ee1cdb2d0c8e982b57b14a141877318dbfcc0e SHA512 7219c5535aa5d91be8132fd74bb7fc7eee2dda0fedc761c031518c0b7b86ec97dee74a03a444979ae2f556e9de252f339e88b337fbedf6efc1a5d97fcefea04c
+EBUILD zabbix-3.0.22.ebuild 9275 BLAKE2B 16b444212a63836beacde9b5e20c0e81c00a316d83341e905c68e3ba553b7acaa1da7d5143991211cd2cf9bc1dd4c9b56dc07282d39597f2bb47841fb0397e08 SHA512 1a554929bb14c9c7279646fcc77d7584d731d57e2395641c944cb787bfe7627dffdb32f874d0d86045c9c9620b7f1f881aa5c30f544d2cb7c387356c7deb6ac3
 EBUILD zabbix-3.2.11.ebuild 9265 BLAKE2B 489884d6ce42e154f3c7c0a9b1f2e0143b9fdd38a1778b13dd8be48d0e4ba1e6645934fcb495dd08a19a22f23201270c2ef79d3d2885316b2eebae142a4bb04a SHA512 f2fd5f8759e9625a798edad0b00868c27f961cb2d3327855cde7e53e46f4950b269bdc95f280d79d89a95291cf92288a6e163fd72562a889f900ddf519a9e44e
 EBUILD zabbix-3.4.10.ebuild 9256 BLAKE2B ce8500fafcebf61f22020f10b23482eadbb1dbc1fc1c42ac9d2c05e429a7ead81ab7def5eeb3521283d62f2f8b947705eca72693082c63c6ed99beeacb14b95b SHA512 9c2ce3518bbdc83215eb191ea097a7233f9032b51d43be4152c630c4c753bfe3f8b827d777c6336f24bd9ec816f02d38d98e01038c179c05de9eb9e8f7889980
 EBUILD zabbix-3.4.11.ebuild 9256 BLAKE2B ce8500fafcebf61f22020f10b23482eadbb1dbc1fc1c42ac9d2c05e429a7ead81ab7def5eeb3521283d62f2f8b947705eca72693082c63c6ed99beeacb14b95b SHA512 9c2ce3518bbdc83215eb191ea097a7233f9032b51d43be4152c630c4c753bfe3f8b827d777c6336f24bd9ec816f02d38d98e01038c179c05de9eb9e8f7889980
 EBUILD zabbix-3.4.12.ebuild 9256 BLAKE2B ce8500fafcebf61f22020f10b23482eadbb1dbc1fc1c42ac9d2c05e429a7ead81ab7def5eeb3521283d62f2f8b947705eca72693082c63c6ed99beeacb14b95b SHA512 9c2ce3518bbdc83215eb191ea097a7233f9032b51d43be4152c630c4c753bfe3f8b827d777c6336f24bd9ec816f02d38d98e01038c179c05de9eb9e8f7889980
 EBUILD zabbix-3.4.13.ebuild 9256 BLAKE2B ce8500fafcebf61f22020f10b23482eadbb1dbc1fc1c42ac9d2c05e429a7ead81ab7def5eeb3521283d62f2f8b947705eca72693082c63c6ed99beeacb14b95b SHA512 9c2ce3518bbdc83215eb191ea097a7233f9032b51d43be4152c630c4c753bfe3f8b827d777c6336f24bd9ec816f02d38d98e01038c179c05de9eb9e8f7889980
+EBUILD zabbix-3.4.14.ebuild 9253 BLAKE2B f381475686894409266e9c642872a728306a89ea472b337709ca45683be504e9ae2822f9d105c256630113f6c874595d130204ca512b6ecd93126fb4926447ef SHA512 d4929f2687c5c0a58ceb7a8a98fed706a62a5a717ba7892d85058b7e1e827095245b022a523daf0d3f53727f42b4ff83c693c1a2195eb3656d589bede632db4d
 MISC metadata.xml 1402 BLAKE2B 02819796719872a78ba4f7f534344bcde607fd95d10ae0087d62b65490289946f81a70b6ae5341ed6579f4855e998fc46bcff6cc463aa7feb4e768736509128a SHA512 8d3ad204e8cfb4d2aa76f0af90c77d7b6e4cc13da54772d95fe43d68bf85eb96e9d96bc2b11b08421e4684b03ad53042a4f4c0a44817f0e4ea804b81996cda5a
diff --git a/net-analyzer/zabbix/zabbix-3.0.22.ebuild b/net-analyzer/zabbix/zabbix-3.0.22.ebuild
new file mode 100644
index 000000000000..bacf8eaf4260
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-3.0.22.ebuild
@@ -0,0 +1,331 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )
+	ssl? ( dev-libs/openssl:=[-bindist] )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping )
+	server? ( net-analyzer/fping
+		app-admin/webapp-config )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( dev-db/postgresql:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		$(use_with ssl openssl) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_server.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
+		dosbin src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+	   dodir \
+	   	/${ZABBIXJAVA_BASE} \
+		/${ZABBIXJAVA_BASE}/bin \
+		/${ZABBIXJAVA_BASE}/lib
+	   keepdir /${ZABBIXJAVA_BASE}
+	   exeinto /${ZABBIXJAVA_BASE}/bin
+	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+	   exeinto /${ZABBIXJAVA_BASE}/lib
+	   doexe \
+	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
+		src/zabbix_java/lib/logback-console.xml \
+		src/zabbix_java/lib/logback-core-0.9.27.jar \
+		src/zabbix_java/lib/logback.xml \
+		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+		src/zabbix_java/lib/slf4j-api-1.6.1.jar
+	   exeinto /${ZABBIXJAVA_BASE}/
+	   doexe \
+	   	src/zabbix_java/settings.sh \
+		src/zabbix_java/startup.sh \
+		src/zabbix_java/shutdown.sh
+	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-3.4.14.ebuild b/net-analyzer/zabbix/zabbix-3.4.14.ebuild
new file mode 100644
index 000000000000..dd57544e3c45
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-3.4.14.ebuild
@@ -0,0 +1,329 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )
+	ssl? ( dev-libs/openssl:=[-bindist] )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping[suid] )
+	server? ( net-analyzer/fping[suid]
+		app-admin/webapp-config
+		dev-libs/libevent )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( dev-db/postgresql:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		$(use_with ssl openssl) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_server.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
+		dosbin src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-0.9.27.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-0.9.27.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.6.1.jar
+		fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+		doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
+		doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}