gentoo resync : 18.11.2018

25 files changed, 737 insertions, 31 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index f95938389f02..552b8df730cb 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/barnyard2/Manifest b/net-analyzer/barnyard2/Manifest
index 845cb2b787f4..0ea94683bdff 100644
--- a/net-analyzer/barnyard2/Manifest
+++ b/net-analyzer/barnyard2/Manifest
@@ -1,5 +1,7 @@
 AUX barnyard2.confd 1485 BLAKE2B 595580c6e765755c159b0e114475ccffe73b587714e9436a0c16c218d22eef3e6c1b197088fe233528cddb9d72c1fa3d279f69a992eac49bec5b6d519a1a5a3d SHA512 23bed3720bc832f110a3c6e8703f0e29c79491aa3bbfda112b49c6b822600d1e96bab0175dee6f133adcb44e1619d91f591fe5db10f458043c89f1948ecc25c2
 AUX barnyard2.initd 680 BLAKE2B 3cd613eb91029876a98900f38bde0cfaca15e47d66d9900a109797bf698ec61f4430cb4bed266c6875ec2a4bfa41a285e5c068b2f9b1f11b16394b9bba6d889b SHA512 32370ac32444e44df517dcc86ae59c548311ab02e49d2cf81d391e111334335968ee1d639c8a36a937dfdaa6a83f5dc33fb9f44ab3d7b822ace28985eabe3423
+DIST barnyard2-1.9-r1.tar.gz 344672 BLAKE2B 720d55170eaf66d2fac7a73990f00dab6faf27c5fcfbcd2f3fa5bad8fa028880fc257a78b60660eaaa5cea3cd8ab04aea2ad173d2135757d7a1f93a80e049d06 SHA512 eb10e4333e862ba6d708e7956b86f9da5da8c52b2756724e821ac5f5ba064791cf84125942bf76e7c563f62c83558aff90219ccc694884e213f6571428849666
 DIST barnyard2-1.9.tar.gz 652879 BLAKE2B 958c926b26ff81c2baaf6993c1eafb10b48d1dc570b885f20f5893d64a56176f39ed5a872fb326d24b699406a0e60bbd1347df56612b5b85148505c72f6544ed SHA512 441a5751b28fd5c0aca73a78a58219a6ce58393e15bf735ae012719d1180e8e58a91d4170fe5c623bfe83de8ca0c04fb6975c8c7d5b6421ceedbf2023b44e72a
+EBUILD barnyard2-1.9-r1.ebuild 1773 BLAKE2B 03a20b1dcddbc7c641b7a7c548f832171c44d5892c3ed43e45b2218a37ae69c10b809a3ef0c5f28de43fa4dd4caae89cf4c5f5c43d586214ffbf8990ca60901c SHA512 20823ccd7a3d32c57e79495ea4a7c96b93e431d7f1b0e4f79accc6824917952bc4aca5565723c274b4ae7469b6525ca50a0f66d5e0188fd7f63c3c83c359621a
 EBUILD barnyard2-1.9.ebuild 1698 BLAKE2B 07fe6d8e7d696a9f94f992b28c2c397532c14c402967d2960a5a06dcdbf34b2cc058b512b8939f0f5683e8d2d2d4af2d151a3505c77837528381e605a3c83958 SHA512 0470caca3b6f1e2ee1013fcff6412907d854de6855c6f06df411cfea1fe8a864a50149274d4f47c826b5ef081e9d14440c01109be1acbf2e2bf8f4e317aa236a
 MISC metadata.xml 1266 BLAKE2B 00bb6b8c75617632fb4e89059005bcaf90e6f637a1227f6717a3d3d3f5957b17eee0936764ae5f74b37a76fd3681dfd87feed8858170ff8dc56a1683549bd028 SHA512 fcc818ef5d01ef3887994a1426e3ded3df4c8239e9b68edc6be943392252a072a42cd98dacb119fc568097e72d8dff0909bc3241e81314194290b40ae0f56b27
diff --git a/net-analyzer/barnyard2/barnyard2-1.9-r1.ebuild b/net-analyzer/barnyard2/barnyard2-1.9-r1.ebuild
new file mode 100644
index 000000000000..8bd23af30787
--- /dev/null
+++ b/net-analyzer/barnyard2/barnyard2-1.9-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Parser for Snort unified/unified2 files"
+HOMEPAGE="https://github.com/firnsy/barnyard2 https://firnsy.com/projects"
+SRC_URI="https://github.com/firnsy/barnyard2/archive/v2-${PV}.tar.gz -> ${PF}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug gre mpls mysql odbc postgres static"
+
+DEPEND="net-libs/libpcap
+	mysql? ( virtual/mysql )
+	odbc? ( dev-db/unixODBC )
+	postgres? ( dev-db/postgresql:*[server] )"
+RDEPEND="${DEPEND}"
+
+DOCS="RELEASE.NOTES etc/barnyard2.conf doc/README* schemas/create_*"
+
+S="${WORKDIR}/${PN}-2-${PV}"
+
+src_prepare() {
+	default
+	sed -i -e "s:^#config interface:config interface:" \
+		"etc/barnyard2.conf" || die
+	sed -i -e "s:^output alert_fast:#output alert_fast:" \
+		"etc/barnyard2.conf" || die
+
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable !static shared) \
+		$(use_enable static) \
+		$(use_enable debug) \
+		$(use_enable gre) \
+		$(use_enable mpls) \
+		$(use_with mysql) \
+		$(use_with odbc) \
+		$(use_with postgres postgresql) \
+		--disable-ipv6 \
+		--disable-prelude \
+		--disable-mysql-ssl-support \
+		--disable-aruba \
+		--without-tcl \
+		--without-oracle
+}
+
+src_install () {
+	default
+
+	newconfd "${FILESDIR}/barnyard2.confd" barnyard2
+	newinitd "${FILESDIR}/barnyard2.initd" barnyard2
+
+	dodir /etc/barnyard2 \
+		/var/log/snort \
+		/var/log/snort/archive \
+		/var/log/barnyard2
+
+	keepdir /var/log/barnyard2
+	keepdir /var/log/snort/archive
+
+	rm "${D}"/etc/barnyard2.conf || die
+}
+
+pkg_postinst() {
+	elog "Configuration options can be set in /etc/conf.d/barnyard2."
+	elog
+	elog "An example configuration file can be found in /usr/share/doc/${PF}."
+}
diff --git a/net-analyzer/chronograf/Manifest b/net-analyzer/chronograf/Manifest
index da887ef7a840..b8f12321f18c 100644
--- a/net-analyzer/chronograf/Manifest
+++ b/net-analyzer/chronograf/Manifest
@@ -2,8 +2,11 @@ AUX chronograf.confd 456 BLAKE2B 149872b15c8f52e1419a02661e65d1029275fecea68821e
 AUX chronograf.rc 595 BLAKE2B 7f067eb786c7790dbfda0e5ff1bc0f63993b631795eb978e164b5170af66696936106f3327223a3a4bbedf416b50cf2ea9dcc13c5adfda0ca2570ad782699c08 SHA512 722fe501606a9e55d2bfaff54bc3b34992fb22bc2ccc82cb53bdbd0683bd844bebb3ea7f3148c011e4321b163866380e0528826e0e59268dd334229ba0741816
 DIST chronograf-1.4.3.0.tar.gz 3979946 BLAKE2B 963511250e1d49ca92e9fde23b3c0899331ef22fe071c47c8d9d6a0ab0264e2dcb1dc083559424ff0b4bb59b0d4eb3121febe6f1ce828bac24598ae8be51cb6a SHA512 49a7565dc58f4f79ad1feb25bf6f74e9267630f6dab5f8767411d11f12dd7a76e9486b8f52c961c27dae6511286192585cee67363acf558287da436c39500ef9
 DIST chronograf-1.6.2.tar.gz 4585236 BLAKE2B a9861f84c1c862512fb1a5166f063a54d6a72f0eb3d175f7314ac50fd04b4f2529e18195cffa49b11a6b13483619ae7e579bc15479f8cea0698fd13cdc594677 SHA512 c4be1deed7ce4f0006cbf123faa0577909bf821581f5f263d3d474963f2541dca0092964a38626b80b5f32c11947f130aa97d37f3d673e304cea665c42bf2a32
+DIST chronograf-1.7.3.tar.gz 16319610 BLAKE2B 3d90ad33ce78b4bd939e5c016ea14b7986d8888707a8a68cd832e0826612aa984d65615301bee4d800343ecc38964103abcf72810c6390fd9cdd65542739e9ba SHA512 dd5e4805dcbe167a399b7927b976839bb99f805abc7caf0fbf9cba479647df1a681f175d7bfc48a2267312e7f89470935623f7bc5e6bcb7cf861928f3e0b2f1a
 DIST chronograf-gen-1.4.3.0.tar.gz 2488979 BLAKE2B 47738629d25dd6b5c11f942bdcea089291bfd8ad1476f448985d35fd35fa4a59274e95b863f7055c34ac0047f584fc45c83e3143aceb8b13b6c4fd28c42039ec SHA512 0346c19f80bea597c87a54f2d5409854a30dfa020bb0326791a6387d81aafe0c6e5112b6d086b21f95dc4f68a269a8fb2e0113156122636c3a6281ba58df6b49
 DIST chronograf-gen-1.6.2.tar.gz 3263429 BLAKE2B 6b6202bfd216a7777c89f2329379df03226b0b212e720987357b66bc26c3d07212a26ed2c41991c7ee3c0eea9f3a731985697b7e4752eb3be906cbc8790a8290 SHA512 55cf76b6c33134a49deb605543ff49aeffaa3baf4262787b19afe1d3d42c2a6e66e88d031f07a2f13a214556c479daa6b40f8586b529730c924ae45bf0e85213
+DIST chronograf-gen-1.7.3.tar.gz 2893752 BLAKE2B bfbc680c3237522844b406504412dd6001eef3f93fc31df18660bb74b7e7561f44c5d3af039af62e000610f40c81e78fcde8a651a5198b4bd152fa04e93c51c7 SHA512 8120f563e0c5be8a7b8179016db72a1ff5eb7447c1124ffeb87d5c928275f3b0080f1f4d01cd9c5b0eef601852b2e3701e3b4cefda9a427bbaeaf9fc46a69ab1
 EBUILD chronograf-1.4.3.0.ebuild 1850 BLAKE2B 458d6135b4a0659c43f76fcc12187dcb1324f888a6554761b81d4fe8821c2aba6f55b011060e23ad9eefb367b262926caf1ffdb624e190a31ed1a8e3a91677a0 SHA512 ff41bdb1e5516b4dbdd0ef4599d04d47a3864e229def6f4cc6874f49489a4a550be9a103e72c25682177470ea4791f9b0548ccc6431224f136763eef4636fc10
 EBUILD chronograf-1.6.2.ebuild 1847 BLAKE2B c33d24b76d191474da1798d8094b60ce1d00266aa22babc8402bacc7e6967447b0fb87669bf5352192b56f7f36b8c7430185c75927969a8695ef8e9de03a04db SHA512 b0d3efafdd1bee06a46dfc445bd8f7aec68b0c3812d24179713add1f66fb014e0773d2e072e01def138412b1e133cdb8a2a28859d4dc70a6e7a4310fdfb37240
+EBUILD chronograf-1.7.3.ebuild 1863 BLAKE2B bde09415012904ee2bcc5896409ee9c5bba276ebff17855b0ed53b0348c3041212aefdb6c3101e7823cff25be2f7b7d0693e5b68ed5e3a0b54b66e778aa5b8ed SHA512 75dd951cd52ce9c93ace572a366d96fccde8560b55f42ea42d270295bbc69fce6440f99013b15c3f9c331ab4e6e6efde80d8b21f26ca25be47c4725daaf23fc2
 MISC metadata.xml 384 BLAKE2B 824a046c27fd9dc3a8f597d8b4bfb89455f033809b6ceb2c34114f3c204e96499f7a6e5942ed56ee5bd3e982b983b9b7af7123b97c6a6af79fb0ff9b7313f7e7 SHA512 dde52f9fbd10db52072d2a40b4c32df30dc596914ab41088d45c931d467e87b4cfffef381f5a35c2eed584ae3bd9798c9b34e3afefb86fb6ca65081f9eaf7126
diff --git a/net-analyzer/chronograf/chronograf-1.7.3.ebuild b/net-analyzer/chronograf/chronograf-1.7.3.ebuild
new file mode 100644
index 000000000000..c4eb4def22b6
--- /dev/null
+++ b/net-analyzer/chronograf/chronograf-1.7.3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 2018 Sony Interactive Entertainment Inc.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN=github.com/influxdata/chronograf
+
+inherit golang-build golang-vcs-snapshot systemd user
+
+DESCRIPTION="Monitoring, processing and alerting on time series data"
+HOMEPAGE="https://www.influxdata.com"
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~williamh/dist/${PN}-gen-${PV}.tar.gz"
+
+LICENSE="AGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+pkg_setup() {
+	enewgroup chronograf
+	enewuser chronograf -1 -1 /var/lib/chronograf chronograf
+}
+
+src_unpack() {
+	local f
+	golang-vcs-snapshot_src_unpack
+	pushd "${S}/src/${EGO_PN}" > /dev/null || die
+	for f in ${A}; do
+		case $f in
+			${PN}-gen-*.tar.*)
+				unpack ${f}
+				;;
+		esac
+	done
+}
+
+src_compile() {
+	pushd "src/${EGO_PN}" > /dev/null || die
+	set -- env GOPATH="${S}" go build -o chronograf cmd/chronograf/main.go
+	echo "$@"
+	"$@" || die "building chronograf failed"
+	set -- env GOPATH="${S}" go build -o chronoctl cmd/chronoctl/main.go
+	echo "$@"
+	"$@" ||	die "building chronoctl failed"
+	popd > /dev/null || die
+}
+
+src_install() {
+	pushd "src/${EGO_PN}" > /dev/null || die
+dobin chronograf chronoctl
+	dodoc CHANGELOG.md
+	insinto /etc/logrotate.d
+	newins etc/scripts/logrotate chronograf
+	systemd_dounit etc/scripts/chronograf.service
+	insinto /usr/share/chronograf/canned
+doins canned/*.json
+keepdir /usr/share/chronograf/resources
+	keepdir /var/log/chronograf
+	fowners chronograf:chronograf /var/log/chronograf
+	newconfd "${FILESDIR}"/chronograf.confd chronograf
+	newinitd "${FILESDIR}"/chronograf.rc chronograf
+	popd > /dev/null || die
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		einfo "In order to use chronograf, you will need to configure"
+		einfo "the appropriate options in ${EROOT}etc/conf.d/chronograf"
+	fi
+}
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 7f687e3d2623..ffbe8aa4c7a0 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -2,10 +2,12 @@ AUX icinga2.initd 2276 BLAKE2B 9573c876cb1fc6ff641d4503d5446840725d94ac2a824cd12
 AUX icinga2.initd-2 2682 BLAKE2B 613fdb4fdcef7c95bba710c5fcb6ee84dcb3cd739bf0caa42130e2d1a4faf7341d82447bbac6070567581b90beba261302e8d03c148876db157c68054f64e233 SHA512 1ca1001e6095b17d57cd7ff70a2cc302f6dfa466cbe0a71154dd188caabd31e4b69821a3d8383ed855dcb2d2c396b2141a70de298a6f3c40ab79993c292fa6cb
 AUX icinga2.initd-3 2390 BLAKE2B 1ead1dd958d978324dfa043abcc58be7ed389207e2bf4dc4786bd2705f94c70a03b84f34a55435f6d9dfcc0483e35da60c1f536dec1060bdc232108c622e0615 SHA512 a43911717fe891e70690647daa57426f70d10f9cb02c721962be4c13cfe8a95bc3ff84b9ba2a293adafc8ddacf8ea6771bd66e7ff6dabe3e732176bf6e6e474a
 DIST icinga2-2.10.1.tar.gz 4406432 BLAKE2B cccc60f63faabed43f9a99f313e3835c15afab9d70e1335f987f431f3187907fedb94451457fe4652886e950b1b058952957832bc7fb5ad5e8f6f4f1f47d4178 SHA512 88e0ef1dfd93a399535f3238cb675e86159ca23d1abfd78009797c3533d10ac5c5167008ff04dfc64d4b9f225e75d85947ce85c5a941250699c0d772be9c0aeb
+DIST icinga2-2.10.2.tar.gz 4408535 BLAKE2B f650826feee13695c42d7e6ced45e3009ac607d6af0bcb16c3f93f8099017a74de40e33deefaffb230a519f9dabf410c03745309d203ede71a4d7076ba8c9121 SHA512 2fb30673fbeef395a43eb7947c0c0217d7c0fc9c149bb244d16dae461dd5728a2540e88bcb351bac2ec5d58d6896f8a4789ced5647cdac8cecf0623fff12054b
 DIST icinga2-2.8.4.tar.gz 2510333 BLAKE2B f551a5eadc93d8455612af40e34a0922bc75f41b8064f9989c8f0c28dc2c3fb18963cf9b3272efa29f03973e7cf5824762bebff1bfa1a23c4ba39c93fc29c8e5 SHA512 b2cb5989962ac65da927cbdbac1b3345c913321d507b5113f32dd90bf969b2513478e68d52b9cd4cf255057d74428f9e42067288b7ddc59ad060ca7b84f4f114
 DIST icinga2-2.9.1.tar.gz 2193190 BLAKE2B 29be491c4b43e218ef8aaa2128822040ccb0989e91d83f033cf7873216e4307cdbc8ee9052d79fd22220c396efeb68759acc97938e3ee596e0820e3f6c8f73bc SHA512 1d69a24f85249386e30ff1625cf522ba58e5f2ab641dbe950bf1764324a6c7516d1532942954e842002566823b0f30383747d5ec8b7bd36705aa5f0ccfa29533
 DIST icinga2-2.9.2.tar.gz 2194226 BLAKE2B edf3309711657437439db907f39d9dd04b57ae6b245f4299cfdfc9e8c27d18bdfa704dc5c1459a94d47985103979915a5d2d8594072586cf908e5f8a9d209ee6 SHA512 75a638a37f66a68f47ec161be4bcadbd1ca0e121143528d08d83170209e0b117fa12b1b9a03d1c1550f495bfd0509ca15f4d80be618177f2791b7a1a69308f99
 EBUILD icinga2-2.10.1-r1.ebuild 4737 BLAKE2B e4df75153cd908b76f323f10eb6413615aad342ddb19c84303b47ce43d9b188b897a49e1c27580039b59627879071a462f5473aefebcc82f2f9d3f39a8683ce0 SHA512 85cfcb9e2fd81289ff39b48e36db648fec4b9a766323ad6aa75daec753b49249a47f635e4f3ad8ebc6528a0c5908afddcde6beea4e47fc7e2e11a29afd1a05ff
+EBUILD icinga2-2.10.2.ebuild 4739 BLAKE2B af9e0e626730fb2514cd38c8decf2308046beffffba6df1e5768593da0941f23a702913af03ca67b0a4034dc59cc7a5f0745fe36903a9bb7c4665a4bd06c1705 SHA512 3f6d8bda9d1f4729d3abf162d1d8d883e7da4310a29d83d8468ced54db64b84caf9c27d2c10b128d2ec8d7aeb9cd654c5416904d8deade3b243ec8a851711f06
 EBUILD icinga2-2.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
diff --git a/net-analyzer/icinga2/icinga2-2.10.2.ebuild b/net-analyzer/icinga2/icinga2-2.10.2.ebuild
new file mode 100644
index 000000000000..913217ef694f
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.10.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-3 icinga2
+
+	if use mysql ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+	fi
+	if use mariadb ; then  # same as mysql
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+	fi
+	if use postgres ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
+	fi
+
+	keepdir /etc/icinga2
+	keepdir /var/lib/icinga2/api/zones
+	keepdir /var/lib/icinga2/api/repository
+	keepdir /var/lib/icinga2/api/log
+	keepdir /var/spool/icinga2/perfdata
+
+	rm -r "${D}/var/run" || die "failed to remove /var/run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners root:icinga /etc/icinga2
+	fperms 0750 /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	fowners icinga:icinga /var/spool/icinga2
+	fowners -R icinga:icingacmd /var/lib/icinga2/api
+	fowners icinga:icinga /var/spool/icinga2/perfdata
+	fowners icinga:icingacmd /var/log/icinga2
+
+	fperms ug+rwX,o-rwx /etc/icinga2
+	fperms ug+rwX,o-rwx /var/lib/icinga2
+	fperms ug+rwX,o-rwx /var/spool/icinga2
+	fperms ug+rwX,o-rwx /var/log/icinga2
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "DB IDO schema upgrade may be required required.
+		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+	fi
+}
diff --git a/net-analyzer/monitoring-plugins/Manifest b/net-analyzer/monitoring-plugins/Manifest
index 7fba0a45897a..99724afa9310 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -1,5 +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
+EBUILD monitoring-plugins-2.2-r3.ebuild 3021 BLAKE2B ea60af62f811f8d15b982cdc9ec80994b6321a530f99081f26d60fad1636b9ac62b2258c4c5aab9aa4dcb5787bc29d22761f2fbef55edcd78a27fa916916367d SHA512 747e16b184b92b5fe3e00e8937c09d07a6eafc584d1234b453bfcf2c0c40e1158647b348e3209db6bf536bfe50ad7913fe2258f300d901573b77135a5afa2dbb
 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
index 52ef5740c27a..cf357d910b21 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r3.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+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
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index c54ed0abde9b..266d7e275a0f 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -14,12 +14,12 @@ AUX munin.apache.include 604 BLAKE2B 796293be594baefca293b6cc5f5d6f31c9ab28ecaa2
 AUX munin.apache.include-2.4 577 BLAKE2B efd0a424cb058b77aa19d6384fac085345f789264b19d878126ca826eda84e79714741529218d9715ba51e175cb1628839e1ca09733f67b370b2401e019c9351 SHA512 b07791a4d5b822b5d0ad84ddbea3444cc1475cee8ee20f62dbb5f3a1792b71dba995e412433d30b3c295e40ad5346528d25e04438ec2dfa535983aae9198cea4
 DIST munin-2.0.34-gentoo-1.tar.xz 11920 BLAKE2B 19cb949b8712ad57544b424de0cb09f9eb33d4c8fe5f680bd3655efb5f0adce53ba4a839258e0324bf734f7367819abc8c6a4b859a48b36b015ea80c0b1f4a29 SHA512 706f8dd1ba49eadb5e89f821f52d4c691b0270885a4167639b6417f9516bb2b0b8b212a82f50fb892e03b57817d650b3552754ecb437718c7e7ef3cdfaf83b2b
 DIST munin-2.0.34.tar.gz 1349842 BLAKE2B 641a780cd42d07c1a4f370dbf3a2647c99d3d69b5226a50f198ef561ff36e362fe397a55102ce57ef70a4a730ed14e02cb3a4f3043cac1874f36670535e0968e SHA512 db802266842e103017c8c3bc0fc676d0d6146a37b06e69e709cfb396d67c42ac4932b8d4979e4d1a108fc0c2467c66423799212f6ea1279fb9ed64352ddf41cc
-DIST munin-2.0.37-gentoo-1.tar.xz 5572 BLAKE2B 5f6371b2fd7e4933e3f19435e74773d2f74d6d909d65aac1f26e334239af2de4f7f78f81ae58c763024a30a15c9eaf9324c5a3a4ccc5b086951c1a49ddf8a2c9 SHA512 9ab47db4c98bc68a32e63aaf44fad83661efa316ff8f19967a886e3c5e268288d7b25503639c89e851edd57a50d215d8dd46b8e9b985feac9d367d56eb21610b
-DIST munin-2.0.37.tar.gz 2249145 BLAKE2B 430a89e6ec5920885abdd09779e61df1365ba132527ac156803a2b71d1a10d716658135a34820083b55ed843f8c6bd502c0f078493ab995df39b0afe4ee5d86e SHA512 22a87fe17a3674464e0cb242c27db57eb97a2b23e5f1fc7044de1b1b8187fbdb2ee5dbab51df42c87dfd8640194fbde23332998bff707368997421c61098d07f
 DIST munin-2.0.38-gentoo-1.tar.xz 5404 BLAKE2B d375c6a6c5bda768f83f701a9cf0236eba6f024c6ac430356cff725c35cfdd84240f5df57d87a0c5bcd71fa5c1dc0482c6a91f7a46d75aeca68f745a74264243 SHA512 a725f978710f328b0a14aa96b5ba499eead358668431c2d53483847846a447bc6f5be855d12c0c13e7dadf821e1c8aee1352ba90f380db389c6d720a0704785f
 DIST munin-2.0.38.tar.gz 2253625 BLAKE2B 10e4c1f9fb846fd30491c00c5be19d627ae97b033a190cfa1d3a5def7455daf7c6cae741b08f3389b4508220eb2bda6b6afd7eddf620dbb745eecd9cbc3e7b08 SHA512 1139cd2ca765ba85fcf7cf37986fb0dd5423d976ae2943373ee4706f376a6f299f0c626912db318eb49e541054017c604725e6f9b0c1e9198530375a2db6eb05
+DIST munin-2.0.43-gentoo-1.tar.xz 4288 BLAKE2B 4b8695c8800712d07474aac3057041c03c63226a7569895d8ff5587592d0d7cdfaf808675ecf08a47c1986a2d8f8cb220091ce680aa87e1e4b7b5f88c806b258 SHA512 ebcd44d9385c799514ac930790928052692ab0f71bc4a641899fa9b6458e083b7f16230a95f703c5b0e2848ab6879e79a1e77f165fcd880c91e4581aafa336aa
+DIST munin-2.0.43.tar.gz 2264931 BLAKE2B 92f2e13517a725303fe2569e65539b432822aa713c663a9974b9fba62db02a3606d0c56240e4e9d108a9f1aaa2ed3fcd9622387aa9b28eccc28356aee2e28777 SHA512 c01448e51aceafd8330e815c11fe63458768b48209edbffad983cffeff2b46f6eef8726792793485d491be9530dacb0bce11abeb2664e01541c73a77c9fd360c
 EBUILD munin-2.0.34.ebuild 12222 BLAKE2B 2a807d7d83ae99af03812a00bebb78d6089a4a94f7fae417b99afa0b07a0ea53ec633334b682c839ee018bb56b6b8e6fb043ec038930bcd89fa04e151f22d70d SHA512 20b6ee28055cb652d231046d1725ca75160d274b41da1fbc9e67bdbe276948013a7376ca9563b3dac71195f4cbd460644db1db0daa00f89c8302603976553a9c
-EBUILD munin-2.0.37.ebuild 12383 BLAKE2B 3da162ea89c907034b757ffed960bf651e04a7268e98d6830868b44b1b45ab00daf77675cc0e16b0e4aea40edeeb9ad66994506d30f17e97a9ac20cbb6900902 SHA512 8ff80be8cd3d11976ddbf9d9748c8a4156a2c0005852ab8f490ea5dc96a37e36d54866b367e0a6b10a1fca77fde3bcb0b6703da2a74b3dc301674164796bd690
 EBUILD munin-2.0.38.ebuild 12297 BLAKE2B 012b21a48257d59999ec27e985825c99512854d305a5becf9ad390d380655e2b679b85f6758fdbef6a6a3f43b4a5646af865ee5753d92cb1cec2b862f50521c6 SHA512 8e09ad8e1e8844c30c8d9ac73f182053899365b986ffcb3be2947f484dcdecf459a0b0a58df717490740bb87019fee83880858216a6a3d2c7eb91bcba4a323d7
+EBUILD munin-2.0.43.ebuild 12245 BLAKE2B bf1f615ea9e351f752283ae79ae4226bea23b388fd6cb34866b7595b86b8a4417628a578b304cd2ef263c35d82c34a5ac4470091b6ec962578de8773aff93935 SHA512 020104a1802bdeb60ae9423d402b0dd2bfdad3df8b84c6b348d94bb1af35c1366a7785d28224dce76d23d8c75c5a99ab94b46500474e997b2c0020c58cf5c0fc
 EBUILD munin-2.1.9999.ebuild 11520 BLAKE2B 7f55a4e139ddb37419299ff65fbda91e22a3e890c86c23bc7d83f902fdc81f36ad665d3f0c6d7bbfdb60684740e1ae86ec9ec9f34dbf15f49e5385c72156fa55 SHA512 6069e6d31b9385885e98e815d4bf33227689fa8e74c48f4aa7b6af673be76d25ef26e777ef819563a8978a3cd73bc518b0ad3e5807c58a5b0e575aeb712f5ce5
 MISC metadata.xml 4116 BLAKE2B 652f8bb067b024f91b3f2fb9d885c93405ccd3e4fdfa141ae5e2996f9898e757d7be93d7e74d027a82403d2b9b472f7c6fec95815b18a0b2975e20e328fb7862 SHA512 ecfa257040277d815c05693724e9ff454b5ddefc1134b6afb38d66783a5e415aae78bdb35aeb0e80882a7b8ff19499f2b3b3646cc2a139e7797a0a718c2389f3
diff --git a/net-analyzer/munin/munin-2.0.37.ebuild b/net-analyzer/munin/munin-2.0.43.ebuild
index b2d7e64c0b8b..0b560be539f0 100644
--- a/net-analyzer/munin/munin-2.0.37.ebuild
+++ b/net-analyzer/munin/munin-2.0.43.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
@@ -116,8 +116,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	rm -f "${WORKDIR}"/patches/0001-ipmi_-replace-the-ipmitool-based-plugin-with-one-bas.patch
-	rm -f "${WORKDIR}"/patches/0008-netstat-plugin-active-connections.patch
+	echo ${PV} > RELEASE || die
+
 	eapply "${WORKDIR}"/patches/*.patch
 
 	eapply_user
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 4aef7c375040..4b34c8ab2deb 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -15,8 +15,8 @@ DIST net-snmp-5.7.3-perl524-2.patch.gz 523 BLAKE2B 6762795cd6bcdccd5b49899cf572d
 DIST net-snmp-5.7.3-perl524.patch.gz 9072 BLAKE2B d870e195bccb8178827791c9bd495d5c13a8848d176ae72b1c6b54b38eabc3b5aa4842d1841f422e3a71d9e9129b2acf303e8961ce98f82f5d9310c3a65e671d SHA512 2d3184ac7c96f75af5bf8c8d23f33d5636c701e052a638e5403a8d5aa34985abc38f6a366ba09a1d8499a05fd71d939a7ed4d530661e56a726386603b6f6e6a4
 DIST net-snmp-5.7.3.tar.gz 6382428 BLAKE2B df036da09658fdb4c52a99696fb6374cd582bc8da765e212285478ffb16c8725ddecd37842aba7835bc90ea74437ce00491dff569b1ce2c7499acf46968b3935 SHA512 0758bba5844cfd6c80959ac16b83906a2f830ba49fd0ab1bf9e191dc6a79d312a2e4760bd53b3e1a1c82759481f0064d088d5a3cf475d84b25679a6bd0f049bb
 DIST net-snmp-5.8.tar.gz 6591680 BLAKE2B ac1bff4152310da57818a00d752a08a7fc61d697b02479d9952ca12d024d3d68dc8bfa674571e93d6f3597605b2fe91513fb6839057a80f2c3dd8d0cce0077f2 SHA512 27895a583b23f3e14c48562bc32f3ba83513d81aa848e878be9a3650f0458d45950635c937ef627135f80b757b663e71fab9a3bde4fd91889153998ae3468fe7
-EBUILD net-snmp-5.7.3-r5.ebuild 5123 BLAKE2B c6fdb0374d6860e846d4011e96e9928f6dc625d3a5fb87f241f98d9b13c2aac79c8dc6eef0d08069a4652d643c82ffc1e41af2233c815b3c0bbbf3e33b540a52 SHA512 638d77772285508a3cc2d990c1ae66e2b06be6af34e07f2a1ba6db04de6f71fb369c3c4d51ebb30eb4035776b073032a74d44093c6186adfd0d1b3ed2b239561
-EBUILD net-snmp-5.7.3-r6.ebuild 5156 BLAKE2B b2b067fb782e94d50da0297bd01f31bfbfdaf0bd405385d66630494b1a597c037940ff7d982328abe40eb34355e02a689f2726b6d5f71c75f7d8055947591d7e SHA512 57771f89b6871f90d6195e12145d76e3116fd40f3c0f1aa871bdd3138026d32967e7f0d9a5eebbc7098b940be5c2a0bb06635e6402701e789c1dc35b6a3d99b7
-EBUILD net-snmp-5.7.3_p3.ebuild 5221 BLAKE2B 810863641282b8a054e0f1fe587ead591a4a3ba7fa7d734b08e16856adae01e11de00e9ad06a0bfc19b17c3d0126b46ecb2a58ce5bc569c30cbe27be71160ead SHA512 f7e0564698e168a6d3365e4744d6776c70ca7a4def86740f19eef3d37f53b88fa231f6e53db004b95213ecd05098a60716b79d9f87ca7b90a44f26149d0357ac
-EBUILD net-snmp-5.8.ebuild 5232 BLAKE2B bb7c9c9b9d8e012b3af0c6420095ac33a1952f2968d467c495ea632c140b8a5a059eb49a4d2d54f5d2ede2d7998e949b84f7468886e79dca4552a3d280ecab98 SHA512 401f3df068e3fb5bd2450704653e41212f23413bba207fec095496cb7490769e25591c7f09bbc459443cf1083d1f3a70f71663fdb8a7d0f3fbcfd309904829f2
+EBUILD net-snmp-5.7.3-r5.ebuild 5123 BLAKE2B 4b131228917ab3884ca81e2777e1de6f8a73fa8b5ca5bfb15aa3224e00a6f7aa0d750ff18339c5abfcb26c01c592c7f182a47bca26728e0e620971c846bb4838 SHA512 a0aa82e9b35f0e2e8f33fe4abe55b706ddb7e6918da85916189e54c1a7273f121a42d802ff0a13ab53e4ed382b398f0fc6834cf9686aedabf850a7fb55230c9a
+EBUILD net-snmp-5.7.3-r6.ebuild 5156 BLAKE2B 29fbde65309d3169b9b9ce45aef271d70d583b859e27362c5c4c5185da1922abf5075f577b046c5e46042f2f1d335633cd81a56dd7e0fa99487f74797f91eb55 SHA512 e80156676b3b4841c24c6aa20af042ef6ea7c21fbf0ea08bb37af95ae4966a0a80f2bcede1e0231fa8065a21b4d97b12ce1828b012a8d887fe808898523405fa
+EBUILD net-snmp-5.7.3_p3.ebuild 5221 BLAKE2B 56b888d44e58c363ba39c15dcea4c967ed70af0c5deb13be737519398d4d3275b5040ddc2c45a5b2a24ac6815c2afbc439c17b20b4830ca462239229f8f89b75 SHA512 6eb247118aa005abc9cadf696c05c533348d836e1d9c7563ef75df7f790f7e5a99998753a55022ff2f0654583b25bd2f4a598fc293e536e3d227ad6adda0b43b
+EBUILD net-snmp-5.8.ebuild 5232 BLAKE2B 66d88e688afc1703b2203a6649b750350c9092e19f9c473490b35b201b87c854c02415dfc07641c9c183800468b4825c5321692e6da8673b88a46a241c44f924 SHA512 d30ef3ae685e1c46b6d603ad841509fc61a36d891c191290416d6cfd3abe2d0c96628baf3609216097e31425fb721e68d0321c93e50257221c58da3699f1ebf3
 MISC metadata.xml 1142 BLAKE2B d026289018d327a888079b9c3cb7cf65dff58dd87735f7317d15d78698fe307d4dad2dfed10adab428eee0eb3abf357c82554b0861029a70fb60b82537601d84 SHA512 76efbc8444b344164960e671df273afaadbb4b64e73b136f559d4f039ee4b145f8ae989d271a8cc025edc917e4213828e0c77f6e5b0258b4c0eb9653c98c58c0
diff --git a/net-analyzer/net-snmp/net-snmp-5.7.3-r5.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.3-r5.ebuild
index fee79b1ccb09..8d923fa28d7b 100644
--- a/net-analyzer/net-snmp/net-snmp-5.7.3-r5.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.7.3-r5.ebuild
@@ -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=5
@@ -30,8 +30,8 @@ IUSE="X bzip2 doc elf ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlin
 
 COMMON_DEPEND="
 	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6d:0 )
-		libressl? ( dev-libs/libressl )
+		!libressl? ( >=dev-libs/openssl-0.9.6d:0= )
+		libressl? ( dev-libs/libressl:= )
 	)
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 	rpm? (
diff --git a/net-analyzer/net-snmp/net-snmp-5.7.3-r6.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.3-r6.ebuild
index b89ac3cf3f15..060479915394 100644
--- a/net-analyzer/net-snmp/net-snmp-5.7.3-r6.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.7.3-r6.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=5
@@ -30,8 +30,8 @@ IUSE="X bzip2 doc elf ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlin
 
 COMMON_DEPEND="
 	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6d:0 )
-		libressl? ( dev-libs/libressl )
+		!libressl? ( >=dev-libs/openssl-0.9.6d:0= )
+		libressl? ( dev-libs/libressl:= )
 	)
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 	rpm? (
diff --git a/net-analyzer/net-snmp/net-snmp-5.7.3_p3.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.3_p3.ebuild
index 77645313cf35..41871ecc1ea8 100644
--- a/net-analyzer/net-snmp/net-snmp-5.7.3_p3.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.7.3_p3.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
@@ -29,8 +29,8 @@ IUSE="X bzip2 doc elf ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlin
 
 COMMON_DEPEND="
 	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6d:0 )
-		libressl? ( dev-libs/libressl )
+		!libressl? ( >=dev-libs/openssl-0.9.6d:0= )
+		libressl? ( dev-libs/libressl:= )
 	)
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 	rpm? (
diff --git a/net-analyzer/net-snmp/net-snmp-5.8.ebuild b/net-analyzer/net-snmp/net-snmp-5.8.ebuild
index 692d3feef95c..c3d4d0622ea4 100644
--- a/net-analyzer/net-snmp/net-snmp-5.8.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.8.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
@@ -28,8 +28,8 @@ IUSE="X bzip2 doc elf ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlin
 
 COMMON_DEPEND="
 	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6d:0 )
-		libressl? ( dev-libs/libressl )
+		!libressl? ( >=dev-libs/openssl-0.9.6d:0= )
+		libressl? ( dev-libs/libressl:= )
 	)
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 	rpm? (
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index 185a2485021f..0e10b2a30383 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,6 +1,6 @@
 DIST netdata-1.10.0.tar.gz 2611773 BLAKE2B ffc4bfa593e4a36785c7e09709f1063598bd337016ad858e435049c5821f44fd5f048e4e7874e06d67c7e59234f6ec67a8a50fc7573f6b2f0cd768770ee2a612 SHA512 2358db818ad7d1ef6298c25d3f9d6c5a5a850f5bbe033b82cca1f3bc154055523637691417b6f2c2d4b7273b575afa0ec13e203ea7c2dd6321088a078ef05017
 DIST netdata-1.11.0.tar.gz 2845399 BLAKE2B e80faa3eb584ec4d617d223463a65f680e199125329c0c5db25c5320421b2c0e769f9334a49824e3974398055238e3bb27f741668850fa6191ffd810da08dc89 SHA512 c3b4045276e4a5af63ccc5403f34d37f2de6dcd95a653aa15ad33dba26c46f2d4cba06b17b1d5289bd1b8697777a41a79a159296f6843a910841523c418149ff
 EBUILD netdata-1.10.0-r1.ebuild 2541 BLAKE2B 70123767be2cbdf1d90dcb05a44a7c34cee223ce00a2b9aa803d5e8c242a638f05be593c4ad382ecc93fb5cc7db443984ae1777adf032da40ca336b4ae4d07ca SHA512 531ceafb0dc2b8988a5af2c1c3c42298bb009d5ae022619cee1940c67fa7b117f5b5fb495ac02adfad61e93729db5908e1b869c114130835d5027fe519faddba
-EBUILD netdata-1.11.0.ebuild 2568 BLAKE2B e4016f929dce3b10d2c84289a5026cf5a3245277c4127ec4ccace28da37dd6f081ef30db548ae167a030a98e624f26649db51a377403e12153140042377b70db SHA512 b14667d07a92c6a1aaeab1f518ddaaf4f4c0966901b38c4d2c8bb6d58f8eb0f014af9e0618a4487fe2bda387039a3416793ae26dbc96b3a63834589acdb31f4a
-EBUILD netdata-9999.ebuild 2568 BLAKE2B e4016f929dce3b10d2c84289a5026cf5a3245277c4127ec4ccace28da37dd6f081ef30db548ae167a030a98e624f26649db51a377403e12153140042377b70db SHA512 b14667d07a92c6a1aaeab1f518ddaaf4f4c0966901b38c4d2c8bb6d58f8eb0f014af9e0618a4487fe2bda387039a3416793ae26dbc96b3a63834589acdb31f4a
-MISC metadata.xml 807 BLAKE2B 33bc115a3c76bd1348fd24771090032f7dacb21c230794805555f2bf02070eb9826c2ffb183f529f85256c6f2c69c40b8d4acd3e5d7d8e047f95558f37c32fa2 SHA512 e45f92bc1610c19cbc21f8503db4c9d7406768e86248ed16a394d17ddfb7b95cb5623223499f4d143ee44482d2e825e9cc693adc10dfae5ab31edaa17d334991
+EBUILD netdata-1.11.0.ebuild 2572 BLAKE2B ce0ff1be7d3290ab66561060bbe9a78e67a93f63d926f46a83c53e9d29ad899268e4b99190effda3976b37c79815936416a788c8ae3cdbb7728eb4916ea4a731 SHA512 57aecf1d2a8e2139dbb002838c6320ea3c2da0935a588a237ab1190dfbfa8761d393c117a519d23885044e8448dbb5e0fe767892c25b2a3e2c7e6c9cb8e97bf4
+EBUILD netdata-9999.ebuild 2637 BLAKE2B 350cefa34f5963df9969c8ee78fb7bdcfa807827c37f6cc716dbdda1e55d59c2d1dcb4614ed10552afa363932cb4ec786891dd971f8cb596173dd9f675856b22 SHA512 ee2fe5a9c9cddfcb2cc74fad245e6778cfcedeaf16088b2c3c78377fbd2d6124930436443aa35efcc8e2881669939a9bfdd20b701cc6bb4066b1a030d4b62470
+MISC metadata.xml 864 BLAKE2B 2c56df62c37c672fe6343a740efa82d16c44dc6f3f38a9afb51cb9c6e93aabd6344ddad599c1504d670e9c1447374b3c6f74125da83577721bcf88a4f68a2dc2 SHA512 cf053acf66105fdd9dfdcff3f6d130f11a2ea0bbf4c553ae704fd86fdd7787efddd55b1bb5f7f8d2ba7e6e2e1a8b800bd80bf907c9b0beba8f12c15e1277694b
diff --git a/net-analyzer/netdata/metadata.xml b/net-analyzer/netdata/metadata.xml
index 80172c7cf071..04af360a6e2a 100644
--- a/net-analyzer/netdata/metadata.xml
+++ b/net-analyzer/netdata/metadata.xml
@@ -10,6 +10,7 @@
         <flag name="ipmi">Install <pkg>sys-apps/ipmitool</pkg> required for monitoring IPMI sensors.</flag>
         <flag name="nfacct">Enable the nfacct plugin</flag>
         <flag name="nodejs">Enable use of nodejs (which some plugins use)</flag>
+        <flag name="tor">Enable monitoring of tor</flag>
     </use>
     <upstream>
         <remote-id type="github">netdata/netdata</remote-id>
diff --git a/net-analyzer/netdata/netdata-1.11.0.ebuild b/net-analyzer/netdata/netdata-1.11.0.ebuild
index 8d23470a368d..250212675e48 100644
--- a/net-analyzer/netdata/netdata-1.11.0.ebuild
+++ b/net-analyzer/netdata/netdata-1.11.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit autotools fcaps linux-info python-r1 systemd user
 
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
index 8d23470a368d..9e53cefcc74a 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit autotools fcaps linux-info python-r1 systemd user
 
@@ -19,10 +19,12 @@ HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
 
 LICENSE="GPL-3+ MIT BSD"
 SLOT="0"
-IUSE="caps +compression cpu_flags_x86_sse2 ipmi mysql nfacct nodejs postgres +python"
+IUSE="caps +compression cpu_flags_x86_sse2 ipmi mysql nfacct nodejs postgres +python tor"
 REQUIRED_USE="
 	mysql? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tor? ( python )"
+
 # most unconditional dependencies are for plugins.d/charts.d.plugin:
 RDEPEND="
 	>=app-shells/bash-4:0
@@ -55,6 +57,7 @@ RDEPEND="
 			)
 		)
 		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+		tor? ( net-libs/stem[${PYTHON_USEDEP}] )
 	)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
diff --git a/net-analyzer/prettyping/Manifest b/net-analyzer/prettyping/Manifest
new file mode 100644
index 000000000000..bacf79f2cc84
--- /dev/null
+++ b/net-analyzer/prettyping/Manifest
@@ -0,0 +1,3 @@
+DIST prettyping-1.0.1.tar.gz 10104 BLAKE2B 41158972fa41fcfaf078fd8fa4b9af10e2d3e65d547f81f0a6daf826f0a1c725de97e14dc597624d2c9281492d94c4b5cf7e6f40e9743aea0792ece0f84211fc SHA512 967626f11cd58fd9a0ce91a320caf6b6a296681ed809e04188f0cfe00d03c80a3620bf4d3ec86e855be363810763ff3ccd8bb0a959d03e62b31edba2cfae7f79
+EBUILD prettyping-1.0.1.ebuild 462 BLAKE2B fbeb62860a572646ad1095ef7886cbff974850365098e97b8bad06821785fcb135e82d151eed1527f7cd50e8d15214300c90df109733248fde1a68aa39b12add SHA512 1e766c7acec0096e1784d526bdc4e03d631e2e99b4221554be8b67d27d633dfa4722cf777e8b0d1110970fa1a3a7144c09a9eb9d74069dfbfee0cec4dce8835a
+MISC metadata.xml 632 BLAKE2B d1cfc1409dc7dea405d834a63e9b06b56219dd16a45d0ed6fb155a92963dee63c222f75793c26be3b8e12eae3bdbf01116a4def4b3977942329b1802193824dc SHA512 14e748d385fd8fc9adb3e45c366be801ca2d0a525fedfcc7de07883553fc8842d870d5d333b8a2f5705af2ede719ec66248392de595ad791ae68db652fc29107
diff --git a/net-analyzer/prettyping/metadata.xml b/net-analyzer/prettyping/metadata.xml
new file mode 100644
index 000000000000..5c168b379404
--- /dev/null
+++ b/net-analyzer/prettyping/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@seichter.de</email>
+		<name>Ralph Seichter</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		'prettyping' is a wrapper around the standard 'ping' tool,
+		making the output prettier, more colorful, more compact,
+		and easier to read.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">denilsonsa/prettyping</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/prettyping/prettyping-1.0.1.ebuild b/net-analyzer/prettyping/prettyping-1.0.1.ebuild
new file mode 100644
index 000000000000..df1c3132fd20
--- /dev/null
+++ b/net-analyzer/prettyping/prettyping-1.0.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Ping wrapper that produces coloured, easily readable output."
+HOMEPAGE="http://denilson.sa.nom.br/prettyping/"
+SRC_URI="https://github.com/denilsonsa/prettyping/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="app-shells/bash
+	net-misc/iputils
+	virtual/awk"
+
+src_install() {
+	dobin prettyping
+}
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 43ccf9bc9b2d..8923c233f64b 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -35,6 +35,7 @@ DIST zabbix-3.4.11.tar.gz 17517171 BLAKE2B 72f7d1cad3e8cb7972cb9c3698d35f70c45de
 DIST zabbix-3.4.12.tar.gz 17509251 BLAKE2B 158c7b3061059cc54a5988296404ed6670ca872fa8fa55f8de9708871ee03f163d0365420e23ef5df89a0a85e2f23d607952cf4fc02c974037555534ca164f08 SHA512 6707ff5a15d2c139775b4b5de32ceb4982c90aa4023af310ab9cb849895387984d32f59b7dc9fbaff8f317a630238437e4651ab8272b4535fb5fc3d88750e3ef
 DIST zabbix-3.4.13.tar.gz 17507365 BLAKE2B a5d1fa1a48df2ad66b844c2c85038a088ea5f7e3e67c2c3ab5f5d1ad695b3a31664d317e6a1cbf64d1f6a211304f50e5c38f5d973d4607f2caa202e1184420cf SHA512 4edcf6d9df0f100c639efa6bc18e67ed59819e719a2226593fd81212d4c2e46a19cb50501cca005246b4c01c4082a18e21c9049a99ac9df263180a3c24fa52f0
 DIST zabbix-3.4.14.tar.gz 17476022 BLAKE2B 9fccdf69bb74379fccfe044d68da8ce458e04c4686ae70a2fed5523309196b13fb022daa00d47ae9eb97a0774942efd766858dfe94890e20f38808ef2a3e3d15 SHA512 597ae107c16578ec2b1a364f2b61a7a7423a1cf39d3b04289e2f91dc0f931e796b566cbd451b14e026c35302120b647d6d574952a453189b066fb06081f9bb83
+DIST zabbix-4.0.1.tar.gz 18005197 BLAKE2B 3da109715f2061a0104f471f9717947510da8d7a3215fe219d5870bbd8bb1cd769d586c04da3e0aa35a114565bd94911e3c4e62eb66de39af754911a9839d2e3 SHA512 431cb75c62c64e0907cccad6633fe07a66fbaaf8595ca33add6de98a3f79832dd87c23ddaffada796a67055cbdef6d2e5d9c6427498518080205d5ddcd5fbdca
 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
@@ -48,4 +49,5 @@ EBUILD zabbix-3.4.11.ebuild 9256 BLAKE2B ce8500fafcebf61f22020f10b23482eadbb1dbc
 EBUILD zabbix-3.4.12.ebuild 9256 BLAKE2B ce8500fafcebf61f22020f10b23482eadbb1dbc1fc1c42ac9d2c05e429a7ead81ab7def5eeb3521283d62f2f8b947705eca72693082c63c6ed99beeacb14b95b SHA512 9c2ce3518bbdc83215eb191ea097a7233f9032b51d43be4152c630c4c753bfe3f8b827d777c6336f24bd9ec816f02d38d98e01038c179c05de9eb9e8f7889980
 EBUILD zabbix-3.4.13.ebuild 9256 BLAKE2B ce8500fafcebf61f22020f10b23482eadbb1dbc1fc1c42ac9d2c05e429a7ead81ab7def5eeb3521283d62f2f8b947705eca72693082c63c6ed99beeacb14b95b SHA512 9c2ce3518bbdc83215eb191ea097a7233f9032b51d43be4152c630c4c753bfe3f8b827d777c6336f24bd9ec816f02d38d98e01038c179c05de9eb9e8f7889980
 EBUILD zabbix-3.4.14.ebuild 9253 BLAKE2B f381475686894409266e9c642872a728306a89ea472b337709ca45683be504e9ae2822f9d105c256630113f6c874595d130204ca512b6ecd93126fb4926447ef SHA512 d4929f2687c5c0a58ceb7a8a98fed706a62a5a717ba7892d85058b7e1e827095245b022a523daf0d3f53727f42b4ff83c693c1a2195eb3656d589bede632db4d
+EBUILD zabbix-4.0.1.ebuild 9327 BLAKE2B cc59b4eb66a4cf8f24ed590f4c312814fdc9f724714c2cf83079ffd5736a6b2f56eed4aefd49fb70a9f249f20b636f1c6aa8966428af81405cbd219146edf176 SHA512 b150906cbaaea7062ff6a3e375cbacb72d78cb520ed4d0b6da17957d6eee312ba20f16ca1f8b2ccdd96b43b601859be8fdb71b15f22f08df596772da00dbb8af
 MISC metadata.xml 1402 BLAKE2B 02819796719872a78ba4f7f534344bcde607fd95d10ae0087d62b65490289946f81a70b6ae5341ed6579f4855e998fc46bcff6cc463aa7feb4e768736509128a SHA512 8d3ad204e8cfb4d2aa76f0af90c77d7b6e4cc13da54772d95fe43d68bf85eb96e9d96bc2b11b08421e4684b03ad53042a4f4c0a44817f0e4ea804b81996cda5a
diff --git a/net-analyzer/zabbix/zabbix-4.0.1.ebuild b/net-analyzer/zabbix/zabbix-4.0.1.ebuild
new file mode 100644
index 000000000000..f936b89f0ddc
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-4.0.1.ebuild
@@ -0,0 +1,332 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS=""
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( >=dev-db/postgresql-8.1:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )
+	server? ( sys-libs/zlib )
+	proxy?  ( sys-libs/zlib )
+	ssl? ( dev-libs/openssl:=[-bindist] )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping[suid] )
+	server? ( net-analyzer/fping[suid]
+		app-admin/webapp-config
+		dev-libs/libpcre
+		dev-libs/libevent )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.4.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( >=dev-db/postgresql-8.1:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	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
+}