gentoo resync : 12.11.2017

6 files changed, 994 insertions, 75 deletions

diff --git a/net-analyzer/hping/Manifest b/net-analyzer/hping/Manifest
index 54fdeb80c321..80a70f872354 100644
--- a/net-analyzer/hping/Manifest
+++ b/net-analyzer/hping/Manifest
@@ -7,7 +7,6 @@ AUX hping-3_pre20051105-tcl.patch 260 SHA256 2f11c02ad7d0a28359e80269b641494721d
 AUX hping-3_pre20051105-tclsh-proper-escaping.patch 550 SHA256 fae6070e3476215697af80ee8b8cbf7f0757e55f80bb862a1894d97acfc5885c SHA512 349286fe6e22f491debe399bdf68d99f27c1baaf27bc9fd976691fc8bcb6fcfb03dae09b3796c1e181a0deca279c6e8a0721d39862a302d02bb05d7557b505ab WHIRLPOOL 0efb86043cb3bb3b7bebf41a22d7860f321806c520771d2cc3d9c962880270b0abe6d27f9d45e8bd4eb182a3e9ac58fdd4266651362348813013c1fac1ef808c
 AUX hping-3_pre20051105.patch 1036 SHA256 1ed8dc0b7b3b3c5336457dfce557f6b82b66b4d49df018f3d934b379fa1ef7e7 SHA512 ab1a6f85d8ba6e91097260b2044502f69033dd7466869cac19d50a1830a9eeea105617ec62e14cebe953b49992a3548c08f243638171de3524cb0058cf6d713e WHIRLPOOL 9ddaea90840c221d272fadffbc1b3d349dd426093f73f37927612e612eff911a148df19316e8f98e590764ba4d9f4a09e9a3e205113fea2c21923b6433c36a3e
 DIST hping3-20051105.tar.gz 584001 SHA256 f5a671a62a11dc8114fa98eade19542ed1c3aa3c832b0e572ca0eb1a5a4faee8 SHA512 3b3faa836e70054c8f9f004d876b7eb5f668b64826a6aaf8ca3685619111d9df4eb494a7d38b83cea6cb5f0bd164956461039bf4f73f7c7e90d80cede639b2b3 WHIRLPOOL 2043ac3d71d795a34abe0fc58f525b54e25ca0b8fadb7b2e88d8a6f5d6f4744bda4471f74c96212a78f58510572c1079683ca57650428924eb6223ee110ea6c1
-EBUILD hping-3_pre20051105-r3.ebuild 1613 SHA256 846b4748feedf300d822edb30b2e9965f6ec488fb9ecd2d655af6c927d402177 SHA512 8046381313f3f33d05a7d47fb37141f9a8b396915825994c4c05ee7a07834b68b4a3633218d0dbbc92d0ed18db6eafa60c45c18de92709c5dd644fb87b5a5ee2 WHIRLPOOL 41fe02813f4a8122ff0382582d6db7ee23404a5b9a6c57bbb6c3cbb17cb7b37f9b49a051ca2edbcc1069069a6ef58d9b2d1251c28f119c38dccf4a41590194e1
 EBUILD hping-3_pre20051105-r6.ebuild 1597 SHA256 687655e4fcec0e31307222b47070fec55f86d5315d006ca89a12c3efc3ff6103 SHA512 22f7aa3764f5d91779ab281bd0a173fc8dffad1f61a8886b82d7b0716fe7b36d1d01eb5ae59452859807f3d6dd50cc7d496893140a60dff9b9be09f60d940617 WHIRLPOOL b5ee000b0cb51cb34285d7291452158163723b6c2ae6b063c1bbb4d18521a0cfe268d50411e7507d1a99912e5c40c92a0e0cf174f3fb5c9dac2fca711461978a
 MISC ChangeLog 3205 SHA256 c6d8fe8b1c9b98c97f4756718f326856f45d4340f1fd771510c7c8d7ac785b31 SHA512 0344a0c44f9204c9accd9bb9ce5528533a89631b78097e4d05de8e98d1e17ee1f28a981fd5184ba9350dc31e4811234ccd807ed8691fc08b3971b8a1ca3339d0 WHIRLPOOL 9dedae73bc4fdf287e144547918794d3c7801049f6a0568b3a61b63f2ae3e2e92438450db105ceaf82c1bc9c7bbae79507b137581bafce45115656c157bcab45
 MISC ChangeLog-2015 9905 SHA256 43fe0c3f7c4fdfb62a5af70bc46a08b3ec91b2f678b921a3d8f634eb797f168e SHA512 35d3d0255c98c547ee63bf2e0145247ed0480271a4d3ba21e11ed26ba39241422ab6793d43c65f5f5ccdce3bdb32f28ad0c25d7ffe2dda8c2f670ff19b988878 WHIRLPOOL 4b22508c121909b9c905930ed0e5525830f3f8772507d7a5777294a6049cff012d5b50a66673274b8b11a67786fd33225fe732fe96524077505653e1d94aecfc
diff --git a/net-analyzer/hping/hping-3_pre20051105-r3.ebuild b/net-analyzer/hping/hping-3_pre20051105-r3.ebuild
deleted file mode 100644
index 38dfcc336db8..000000000000
--- a/net-analyzer/hping/hping-3_pre20051105-r3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils multilib toolchain-funcs
-
-MY_P="${PN}${PV//_pre/-}"
-DESCRIPTION="A ping-like TCP/IP packet assembler/analyzer"
-HOMEPAGE="http://www.hping.org"
-SRC_URI="http://www.hping.org/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc sparc x86"
-IUSE="tcl"
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="net-libs/libpcap
-	tcl? ( dev-lang/tcl:0 )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}.patch \
-		"${FILESDIR}"/bytesex.h.patch \
-		"${FILESDIR}"/${P}-tcl.patch \
-		"${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-libtcl.patch \
-		"${FILESDIR}"/${P}-scan-overflow.patch
-
-	# Correct hard coded values
-	sed -i Makefile.in \
-		-e '/^CC=/d' \
-		-e '/^AR=/d' \
-		-e '/^RANLIB=/d' \
-		-e 's:/usr/local/lib:/usr/$(LIBDIR):g' \
-		-e 's:-O2:$(CFLAGS):' \
-		|| die "sed Makefile.in failed"
-
-	# Change name from hping2 to hping3
-	sed -i docs/hping3.8 \
-		-e 's|HPING2|HPING|g' \
-		-e 's|hping2|hping|g' \
-		|| die "sed hping3.8 failed"
-}
-
-src_configure() {
-	tc-export CC
-
-	# Not an autotools type configure:
-	sh configure $(use tcl || echo --no-tcl) || die "configure failed"
-}
-
-src_compile() {
-	emake \
-		DEBUG="" \
-		"CFLAGS=${CFLAGS}" \
-		"AR=$(tc-getAR)" \
-		"RANLIB=$(tc-getRANLIB)" \
-		"LIBDIR=$(get_libdir)" \
-		|| die "emake failed"
-}
-
-src_install () {
-	dosbin hping3
-	dosym /usr/sbin/hping3 /usr/sbin/hping
-	dosym /usr/sbin/hping3 /usr/sbin/hping2
-
-	newman docs/hping3.8 hping.8
-
-	dodoc INSTALL NEWS README TODO AUTHORS BUGS CHANGES
-}
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 0ee6299f39d8..6f22c830359a 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -30,9 +30,11 @@ DIST zabbix-2.2.20.tar.gz 15503661 SHA256 139a4000455bf948df247b4312b9127701596e
 DIST zabbix-3.0.10.tar.gz 15573988 SHA256 49ab7a69352fc07c88e08f10e20ef714adde6d08e44df8af81edb82e26c7c772 SHA512 cb5602a6fdb78f4f5e3b6b0193e707497e8c04a7558da8345e2e9130f3058be670a48d501b36bca87d10a1964188ae81eb6cd83a573499086ce1f2152dfa9936 WHIRLPOOL d8da9e2eeaf1a7ded198f25198742a53b97762000b2f84add25fcbc05ff2c5be48193072338e6131e0d905d8429d581802125806512d7705e5f1aa50211fb385
 DIST zabbix-3.0.11.tar.gz 15642949 SHA256 e161f4b9ff233740029f9fa39c4cf7f1c7e3d829c465741b200d82d53ffda444 SHA512 880b69677833ed636c866fec731d84540a0269975c767bbcb834ca0bb22b8b881095b80b359e30e965282935650e6533d0e930bb6c21b2f6245d57a0e6e73ec6 WHIRLPOOL c4260523379640780fd3d06a86c6c0f001125b53c0b6e7a61f800ba123800737600c46f54756072fbfa3013844aaed68b999aa0687a1e9942b27ec853da6b44c
 DIST zabbix-3.0.12.tar.gz 15647628 SHA256 56384555c399f74eb16e822c8c1522710add0f9fbfc8d6109eaed1ac2b723d84 SHA512 2aea3def2a5a656afde9728c18cc92a201a3d04203f163d3e67c3cb283bb23b94eb3c4d98b1905343080b0740b9670a2efd10f60229f26bb0c9b82c368b3fabd WHIRLPOOL e3a8427319e672df95020db232377dcfbbfbd3a08f8ec920691e52a80eea52d6c99fe9e3125fb5a65a624fe2412ac3bd545b475915b4a302e49c58aad30bb003
+DIST zabbix-3.0.13.tar.gz 15648338 SHA256 95db0a182a973e364c35dd10eb45820af0a7eee5125bbbf53978b975ae949b67 SHA512 824fba8d4a31919af358d6085e366a4d758c7fd12486a40de79595dff628467d1a46fa84d0af287ab06ad22da7dc855c5cce1a44b5033b0981cac0ca02686acc WHIRLPOOL 7d5cb7ccea6d5a4587908ed0a5b05040b05075e6bf576d2520651bf7547db7c2d3b3c98580d5c105084688b450df05da4fcc359e6c468a1276eceba2c812eb9f
 DIST zabbix-3.0.6.tar.gz 15513412 SHA256 4fe972b061cae8cc91bf2870f2caabc967096f31def5a3f53e8789154b05a97b SHA512 ccffc58f3555bea62011bad272e8a3085d1723d8cb200e00a3e657696104c3fd055b8b963a26d9c726ef45a5381c7f9625498e99b756a3dd97b147d8b7884d1f WHIRLPOOL 137eb724b5205e5d38d00f96c62da5f96ef91c57b01280489bafb67c54d10e7c40304b4674fcefedda9381dfe6d2721b81dbcda1822f56f6d538e067c2588fea
 DIST zabbix-3.0.8.tar.gz 15514547 SHA256 1df3e106427ed21547b8119049a161092f597d04507f9eb535951a9ee887a476 SHA512 9f5fec7f3888f34ad9659a5d34d5fc089efc86a5fcf78f8cabf6704fbf95fd52a8caaab6f4291cb76d15cc2d69c986c95346fbe4fdfdc407c5506f3b8946aa1a WHIRLPOOL 83a391ee2d60e974fa4e569050b62af69df192d24ad8dd151d39b668a170980f4dc448e3564a823662aecf5a2f03adca9e32c37b4949c95cab71425e786ab0bb
 DIST zabbix-3.0.9.tar.gz 15516440 SHA256 4445f26c025009681c29c9b350aa6c4ee7b124ddcaf1609ae36c55997bcb8cf2 SHA512 f34d0fde48e64dfb6bea152ab6c63eb28be66e3647cc781d430b56b13bc91ac9f194ac80d264b2e837f8fceb929e0ebeda0221bf8363eb0a66e53461088a4ef9 WHIRLPOOL dae1417efa8df60633a950473af7cf9b533dc63abfdd95b2f2edb30fc07d074fa8ef626927e578911eead45461cdc4918f92be17c21d494d6f198519c117a74d
+DIST zabbix-3.2.10.tar.gz 16089723 SHA256 c42453b2b4f408184b7d21e30609d3c1008f5789125e9ede6986e0432c5c31aa SHA512 6413247ea0f47f410eadd970599dc4a0bfef4202b6f88bcb1636d1fad270a2d5545a90870052af5445a5219dab3b58867c23f3afaddb5d78e200fecbd987e545 WHIRLPOOL dc522fc6777b7ed7006e57a8c2e7bafb3ff1292e825c00bb7bfde36776f3d34f744bfc0a606dac13261b269da6460ee82228363e05e6c884ba9b045bd6c4bccc
 DIST zabbix-3.2.2.tar.gz 15915015 SHA256 f9760dde57b1faee4bbecf00c39877678d58aaf4b6205e010d6b049d9cf4535e SHA512 1f6cb6344d24ed91c49fa116d6862cfd78caab9cd3297329369dd2df5cf9c83fda67bc9faa1a59f2b605bfeda73a69a3e29653fca320eda1b67f4d0931bfdb9b WHIRLPOOL a3e9c22459376b29b3f041f0e57b369976e2fa6eb752dd79e3f862a3095c216c91e08854dff350505c33c0a5e1b73b0c4b677d5a2bb1c0c872791023c741ac77
 DIST zabbix-3.2.3.tar.gz 15922416 SHA256 e6dba74039d8d6efff86ec3da99909f4daeaeb66d48781bbb666e3094533da25 SHA512 5a704282765fa66d1aa53ae546d3a49a35050d6830a25a3a9ad64d73f8aff48b31e8d13f37d147c8d6244bb0f2dab21bceb5d022f1c3ffa726c10edc6e7bd1f6 WHIRLPOOL cab23a3edfa53f7b505f0d7e03fbcf0a2f59a52e441e195b5f7ff5555ee7bd0258ba7cb93e45f894e16ba4ad1a1b236cfef0cc65c7b7905ee0ebde2e11972710
 DIST zabbix-3.2.4.tar.gz 15924840 SHA256 22cf19ef5a9478df2281bf518e8be38adc7dbc508bf63111e02388ca7aabeef4 SHA512 62e532bcf6a5ab82b1f943e28d46d1e64782758a405680d2c1a54e9c1092a340a50987045acbbad2b57439e3c2640d8a11fe1a29a234764859befa6a7fd779d1 WHIRLPOOL 8cac552472bb186a1e16bc809d68a7dd7a63eaec7503f204bec58cd03ce9f813247d47e95b6a17baa3765dca9a51835c2dc4d6efbc69bcf03ff64cb976ac716f
@@ -44,6 +46,7 @@ DIST zabbix-3.2.9.tar.gz 16098846 SHA256 58842077466bc4e1441a84d8df62c3c8cb48bc2
 DIST zabbix-3.4.1.tar.gz 17010519 SHA256 faaf1a1569ec6b4674d80e707904197c8b568f2b4660f636c28d0c42af471fd4 SHA512 e3ce49cbbb6ada1d12fa80ff366b9e819b8d7b8c60474698457f8250682614af0d2e5de6c2f6a9e34ab10bb8fd01eac51d8365489606b6d0aefc103c5780ebce WHIRLPOOL 52cfae3172e36a61db75f82f37ec97c9c85614c865c30b784b7644c2af99790e295f9700a1dcddfe85d23825f1b4cfccc2a9785051a8cb8d0c4439626ccbfcd9
 DIST zabbix-3.4.2.tar.gz 17113290 SHA256 54c21e04da4ef43380af647c6a0ddff67614337386fa318da021117efe5b334f SHA512 42feff59e1e1dd5d69a66cc857e9076b9a6f1410b5796a719cb660ea97ccd2544fe87f3cfabc27590cc53a321d24a7977daa320be1fdff31653b3650602dd385 WHIRLPOOL 752bf703018a67b8299a25b40e1fd204abf9e37675313705646b5eac05dfa84b5301f3ef9588aa21e097b1608ae82db418b084866f70800d78eb2384c1d34fce
 DIST zabbix-3.4.3.tar.gz 17130788 SHA256 00e87db503d332a1e3905d13f36b6ddad32c2514f03060361168655a8d4fd8cf SHA512 338f4c367d906252ad762ffff60652f6f3d8f0027684e1562fbf26a4628002b72671dd6a2a3547c1681277a9cdef544d671b89edac886e96914a0b3850e639a8 WHIRLPOOL 0568b4c28ab887d49c7d00accb0311faed150fb19b150ade01462f43a12af3c365c1a9731474be1ef3c3297430ef0f0348ca0fd45ef118ffa61cda1d5258161e
+DIST zabbix-3.4.4.tar.gz 17132537 SHA256 2ee84e72a0d441f322ec0ab6f332ff174dec300b3acb8389769aadeb39a353a4 SHA512 2d9724ded1e3388c24ce9defbbe1ccd4804a925175ae76bc352a86332cfde3a692b4f447d6809a0d8394ffe51ad1a2fa3cff4459e850a6e8f7b1596811c441a2 WHIRLPOOL 41696cf747610d1d5766deefce2aeb8889d2b0c6d27881a4dbd1db0426a570d156a1c071b8fe7fd29b0cac8ffb594d2df20b17eb2620b656a3fb632838f29850
 EBUILD zabbix-2.2.16.ebuild 9411 SHA256 33d56135b2eeece3b16240f014c8a20cf5d2731676e0e92e2709a952876efce6 SHA512 522fdcebd45a24c517c7a74b9e80969d4573f63205440ca61c0252d6280529f83019864c3ae24f89493974c06be09f7fe9872fc56332b1d8b950de6782b8d95c WHIRLPOOL 55ad51914a7f4088f84d401e12586fc417d76f42e8fcd1efaef78dfefde45f57d95b8fb43057aa61c9002a1caaae5a82d77d20259a8cdd23d3639cb6736b9e6e
 EBUILD zabbix-2.2.17.ebuild 9413 SHA256 87f763ba407034930c2ed76d479156744643d638ac7bde922b2425f8543499a2 SHA512 183407027ea64f68e8f257637444a160e7b4e42a590b9dc31d58273fe0280e733f8d0b4e9285ced47a2e818acc145e1cb381c61691ea536ae913ed4ffffcc055 WHIRLPOOL 206802f10e3ecd36c56edaf9d465d1c88b994c3c7147035d7f164f6b5a9b646fc1142c6984e4fb51e11f29031af4699e2dd4b68babaa01e06158b393048695a6
 EBUILD zabbix-2.2.18.ebuild 9413 SHA256 87f763ba407034930c2ed76d479156744643d638ac7bde922b2425f8543499a2 SHA512 183407027ea64f68e8f257637444a160e7b4e42a590b9dc31d58273fe0280e733f8d0b4e9285ced47a2e818acc145e1cb381c61691ea536ae913ed4ffffcc055 WHIRLPOOL 206802f10e3ecd36c56edaf9d465d1c88b994c3c7147035d7f164f6b5a9b646fc1142c6984e4fb51e11f29031af4699e2dd4b68babaa01e06158b393048695a6
@@ -52,9 +55,11 @@ EBUILD zabbix-2.2.20.ebuild 9413 SHA256 87f763ba407034930c2ed76d479156744643d638
 EBUILD zabbix-3.0.10.ebuild 9276 SHA256 2468af2abb48074e6ad8864cc84ef46c99a1abe022c278e92992123086434ebe SHA512 6739ba08d11cd9c05f2ab55dd2d60c8f808636e4c7af6c188280b7a3ed41c8d976d4526f53064859d2bec3e4b8e32dc98e0ab4718691893dd6c68a28af2d3c3c WHIRLPOOL a77a540a4d94a969fb09f67762cbb52c2c7728f749ae74a35fab6af827f86264374ba46f713123edc9038722dc1f97ce6d0d25653b40f1cf5b4e4a41caa599f6
 EBUILD zabbix-3.0.11.ebuild 9276 SHA256 2468af2abb48074e6ad8864cc84ef46c99a1abe022c278e92992123086434ebe SHA512 6739ba08d11cd9c05f2ab55dd2d60c8f808636e4c7af6c188280b7a3ed41c8d976d4526f53064859d2bec3e4b8e32dc98e0ab4718691893dd6c68a28af2d3c3c WHIRLPOOL a77a540a4d94a969fb09f67762cbb52c2c7728f749ae74a35fab6af827f86264374ba46f713123edc9038722dc1f97ce6d0d25653b40f1cf5b4e4a41caa599f6
 EBUILD zabbix-3.0.12.ebuild 9276 SHA256 2468af2abb48074e6ad8864cc84ef46c99a1abe022c278e92992123086434ebe SHA512 6739ba08d11cd9c05f2ab55dd2d60c8f808636e4c7af6c188280b7a3ed41c8d976d4526f53064859d2bec3e4b8e32dc98e0ab4718691893dd6c68a28af2d3c3c WHIRLPOOL a77a540a4d94a969fb09f67762cbb52c2c7728f749ae74a35fab6af827f86264374ba46f713123edc9038722dc1f97ce6d0d25653b40f1cf5b4e4a41caa599f6
+EBUILD zabbix-3.0.13.ebuild 9276 SHA256 2468af2abb48074e6ad8864cc84ef46c99a1abe022c278e92992123086434ebe SHA512 6739ba08d11cd9c05f2ab55dd2d60c8f808636e4c7af6c188280b7a3ed41c8d976d4526f53064859d2bec3e4b8e32dc98e0ab4718691893dd6c68a28af2d3c3c WHIRLPOOL a77a540a4d94a969fb09f67762cbb52c2c7728f749ae74a35fab6af827f86264374ba46f713123edc9038722dc1f97ce6d0d25653b40f1cf5b4e4a41caa599f6
 EBUILD zabbix-3.0.6.ebuild 9276 SHA256 ce18219796d2ae09dc32c82c551b89242ef67c6f4e9d5af1c1caae4af4ee985c SHA512 4275953f472eb7a4e6fc0988f93eb1f3d1f133d15dd245120fe5e48a1f4a3276debf412667b248bead4045e9c067818f1a2aed03b9b14d18cc45515d8232881f WHIRLPOOL 6efcfab549c0fc2f651d2b56cf6f9a88a5058fef4f5010c6721557cef03d78e5ab3e173ebeeeb6a4b851fb485486d2de0a9acea4c29c627639009d9a90f1eb75
 EBUILD zabbix-3.0.8.ebuild 9276 SHA256 2468af2abb48074e6ad8864cc84ef46c99a1abe022c278e92992123086434ebe SHA512 6739ba08d11cd9c05f2ab55dd2d60c8f808636e4c7af6c188280b7a3ed41c8d976d4526f53064859d2bec3e4b8e32dc98e0ab4718691893dd6c68a28af2d3c3c WHIRLPOOL a77a540a4d94a969fb09f67762cbb52c2c7728f749ae74a35fab6af827f86264374ba46f713123edc9038722dc1f97ce6d0d25653b40f1cf5b4e4a41caa599f6
 EBUILD zabbix-3.0.9.ebuild 9276 SHA256 2468af2abb48074e6ad8864cc84ef46c99a1abe022c278e92992123086434ebe SHA512 6739ba08d11cd9c05f2ab55dd2d60c8f808636e4c7af6c188280b7a3ed41c8d976d4526f53064859d2bec3e4b8e32dc98e0ab4718691893dd6c68a28af2d3c3c WHIRLPOOL a77a540a4d94a969fb09f67762cbb52c2c7728f749ae74a35fab6af827f86264374ba46f713123edc9038722dc1f97ce6d0d25653b40f1cf5b4e4a41caa599f6
+EBUILD zabbix-3.2.10.ebuild 9240 SHA256 898444a2640f901c033b890641d8ab0b2b30eee6efb074eb1cd6aa187e0cf1c9 SHA512 502e7299347bce819d47662096eeb5d5161f63777d0ba337bc18b75936d81b3a416c37703506dd342e40792051e3233dff168c3dc99aa611c4af7ae43dec8016 WHIRLPOOL 588482189282116bffbee2010f93a5a627494e514a8e60edb4270989484dd6552df648a8205d1f230af18da9a2235f522732cecf93b3a860062f1255271d243f
 EBUILD zabbix-3.2.2.ebuild 9240 SHA256 154e1f99b7cf5f63b2bba9b16f0f756ef9429c53fa731bd2099d6a8fe987a604 SHA512 6a72ef2a6cbcecd6474f38500b40ef54de31542e1885fc1bd76a3e285b4771c98d0827fa13b2e9c9996745b4f44446d3a89c7ba971806197c6a23bdf9386848a WHIRLPOOL 60e3db4eb99a80e2582f6ea9a24c15b0a806f1f401586dddcd073275900d5ba17ec3aecd143328d9d02627829a2c8aaa6022495a1423d99c660dae39aea762fc
 EBUILD zabbix-3.2.3.ebuild 9240 SHA256 154e1f99b7cf5f63b2bba9b16f0f756ef9429c53fa731bd2099d6a8fe987a604 SHA512 6a72ef2a6cbcecd6474f38500b40ef54de31542e1885fc1bd76a3e285b4771c98d0827fa13b2e9c9996745b4f44446d3a89c7ba971806197c6a23bdf9386848a WHIRLPOOL 60e3db4eb99a80e2582f6ea9a24c15b0a806f1f401586dddcd073275900d5ba17ec3aecd143328d9d02627829a2c8aaa6022495a1423d99c660dae39aea762fc
 EBUILD zabbix-3.2.4.ebuild 9240 SHA256 898444a2640f901c033b890641d8ab0b2b30eee6efb074eb1cd6aa187e0cf1c9 SHA512 502e7299347bce819d47662096eeb5d5161f63777d0ba337bc18b75936d81b3a416c37703506dd342e40792051e3233dff168c3dc99aa611c4af7ae43dec8016 WHIRLPOOL 588482189282116bffbee2010f93a5a627494e514a8e60edb4270989484dd6552df648a8205d1f230af18da9a2235f522732cecf93b3a860062f1255271d243f
@@ -66,6 +71,7 @@ EBUILD zabbix-3.2.9.ebuild 9240 SHA256 898444a2640f901c033b890641d8ab0b2b30eee6e
 EBUILD zabbix-3.4.1.ebuild 9254 SHA256 086a73af7a3673ea5700f28ca28dbb5a034ee79fba97e19a8f0cef4b0963ed50 SHA512 979b168af278b789bd0779f8762baa605dda2c2f109155a6f7ca45df23e4c0e922357975cd5dfbb861fc4497f9bf5a455f17c333da41414af196450a15ffcac0 WHIRLPOOL aa104fd5758c3abe0c8986c91b6e68473c05ed383fa97d9c15542e98935ab44371ad9b4c055821b4304ef91fc196d1d85e30c50e84d6f4e24c207acb002e5590
 EBUILD zabbix-3.4.2.ebuild 9254 SHA256 086a73af7a3673ea5700f28ca28dbb5a034ee79fba97e19a8f0cef4b0963ed50 SHA512 979b168af278b789bd0779f8762baa605dda2c2f109155a6f7ca45df23e4c0e922357975cd5dfbb861fc4497f9bf5a455f17c333da41414af196450a15ffcac0 WHIRLPOOL aa104fd5758c3abe0c8986c91b6e68473c05ed383fa97d9c15542e98935ab44371ad9b4c055821b4304ef91fc196d1d85e30c50e84d6f4e24c207acb002e5590
 EBUILD zabbix-3.4.3.ebuild 9254 SHA256 086a73af7a3673ea5700f28ca28dbb5a034ee79fba97e19a8f0cef4b0963ed50 SHA512 979b168af278b789bd0779f8762baa605dda2c2f109155a6f7ca45df23e4c0e922357975cd5dfbb861fc4497f9bf5a455f17c333da41414af196450a15ffcac0 WHIRLPOOL aa104fd5758c3abe0c8986c91b6e68473c05ed383fa97d9c15542e98935ab44371ad9b4c055821b4304ef91fc196d1d85e30c50e84d6f4e24c207acb002e5590
+EBUILD zabbix-3.4.4.ebuild 9254 SHA256 086a73af7a3673ea5700f28ca28dbb5a034ee79fba97e19a8f0cef4b0963ed50 SHA512 979b168af278b789bd0779f8762baa605dda2c2f109155a6f7ca45df23e4c0e922357975cd5dfbb861fc4497f9bf5a455f17c333da41414af196450a15ffcac0 WHIRLPOOL aa104fd5758c3abe0c8986c91b6e68473c05ed383fa97d9c15542e98935ab44371ad9b4c055821b4304ef91fc196d1d85e30c50e84d6f4e24c207acb002e5590
 MISC ChangeLog 11545 SHA256 31fa904f00b346fa7cbddbace720019f7d8aa9c9d91b549934f2b2560acd840e SHA512 e380c06a57c77fbc67d5d6c818c02b9611cedab166a94c78775648e941a86ddadeed98a021fc1e6a9bdbff29964582b827b0e37747bd2ab9b8c13b193f0b17f9 WHIRLPOOL 157ee54c2f767570374dd6008837cd6a07ab09c12ff4e263d6d00cfdb3e1dd80a54a46237d0b59f587cf50779668a6de0eed5c8ada96b05d7ffd390a37f44107
 MISC ChangeLog-2015 41076 SHA256 7feb294f642c0a648b2fe1918b7b6238f780e2805cd9646b791e08af1857414e SHA512 6f5e87f26f273baaa5e4eb611af23600b6011a145e304a2a97f5ade594a6a581734a083924bbd9867444793e49b62d36244b0d2d723445d4ab0226fee351a803 WHIRLPOOL 10bf063a8209b7ab3d67e4fd3de13d605e7637deaa2f4c1764cd272f2dfda0676538e50161deaadaad90b75a1b902200d120956fb4e5f119ccc8d65a1a266682
 MISC metadata.xml 1402 SHA256 3790615d203c28077ae91711a0cff900074d5f5853fd99ed53c2fede9fb873bc SHA512 8d3ad204e8cfb4d2aa76f0af90c77d7b6e4cc13da54772d95fe43d68bf85eb96e9d96bc2b11b08421e4684b03ad53042a4f4c0a44817f0e4ea804b81996cda5a WHIRLPOOL c50a85cfffea91c2f0a1218bba6f172edcc5d965d7e917e066ce6002ef66079255f377da9a7133f736552227c51d77e9c7363dc1e4a8cfcc02b09020eba91387
diff --git a/net-analyzer/zabbix/zabbix-3.0.13.ebuild b/net-analyzer/zabbix/zabbix-3.0.13.ebuild
new file mode 100644
index 000000000000..13448bdf670d
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-3.0.13.ebuild
@@ -0,0 +1,331 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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="http://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="http://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.2.10.ebuild b/net-analyzer/zabbix/zabbix-3.2.10.ebuild
new file mode 100644
index 000000000000..31176f59177a
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-3.2.10.ebuild
@@ -0,0 +1,328 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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="http://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="http://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[suid] )
+	server? ( net-analyzer/fping[suid]
+		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
+		fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+		doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
+		doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-3.4.4.ebuild b/net-analyzer/zabbix/zabbix-3.4.4.ebuild
new file mode 100644
index 000000000000..ae1d5666084c
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-3.4.4.ebuild
@@ -0,0 +1,329 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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="http://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="http://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
+}