commit:     821ba276559a3b8f4c8a003ff5740c40accb20ea
Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  2 16:31:52 2019 +0000
Commit:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Sun Jun  2 16:31:52 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=821ba276

net-analyzer/zabbix: Remove old

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Patrick Lauer <patrick <AT> gentoo.org>

 net-analyzer/zabbix/Manifest             |   9 -
 net-analyzer/zabbix/zabbix-3.0.19.ebuild | 331 -------------------------------
 net-analyzer/zabbix/zabbix-3.0.20.ebuild | 331 -------------------------------
 net-analyzer/zabbix/zabbix-3.0.21.ebuild | 331 -------------------------------
 net-analyzer/zabbix/zabbix-3.0.22.ebuild | 331 -------------------------------
 net-analyzer/zabbix/zabbix-3.4.10.ebuild | 329 ------------------------------
 net-analyzer/zabbix/zabbix-3.4.11.ebuild | 329 ------------------------------
 net-analyzer/zabbix/zabbix-3.4.12.ebuild | 329 ------------------------------
 net-analyzer/zabbix/zabbix-3.4.13.ebuild | 329 ------------------------------
 net-analyzer/zabbix/zabbix-3.4.14.ebuild | 329 ------------------------------
 10 files changed, 2978 deletions(-)

diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 7aad59b1096..3c75a3d058e 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -1,17 +1,8 @@
 DIST zabbix-2.2.16.tar.gz 15498413 BLAKE2B 
fc634ca5124525b3143bb736b53b5040c8f1fd45ecfcf3cc2bdf7e625d54b0fcfa3690ce5d766e987d320d9ccbf7f430957f532c31f180a0a037334d6eb5b51a
 SHA512 
5d92c17e86608359fff220416d5eed2d4ac10edfe56f4162f4b7660c472cf6f609ba01034d76e5b7164c22d55a1fc5be753f5d0e0ce7ac71d00a6f68dca14afd
 DIST zabbix-2.2.21.tar.gz 15489747 BLAKE2B 
e00fe140977f0ce995497954a15ff647c813c048a706e536a12010a649d3467d6c63343c3c0d11b1900f91f8fcc5bb235f9e4a030362c93ad3c1c31e68699f54
 SHA512 
29e3cba0663e7160dce5141cc389959571e5e298206baed26209facab206cc4f66611d48d76306a53925a2096db6f0bed1753435ec1be20bd8db53862cb902a4
 DIST zabbix-2.2.23.tar.gz 15504361 BLAKE2B 
c0eec293a92564607ed56c570aca30385481cf028fdee2bb51fbb29b40d7a1908a6065a6ee21c019ed6fb9eee294bc8fb58414669ae8e16e50f614a0650e2dbd
 SHA512 
178e193f83dbaaa8aa0a0b87dd621acf7aa24e0d84d0010532b419139ed02e3cf892e4e772362bb855efb5966a64b9da8d3512eb91e759835039dc8c3529ea56
-DIST zabbix-3.0.19.tar.gz 15642128 BLAKE2B 
b9b84f21371db1eb8efdfb547e2b4a9216e9fb3c76fe54420ab1c76bad5cbf4537f6f0aca720748d39fb2ebf0447c3f82bf9e0d276f9fa4c9e91bc70e8b67f22
 SHA512 
30239db9236f536325f0ad3a8ea08abd8c460caf60dfd80b881cc9532d2f65d6154e8911be89d141539f7eeced359809405cf1b655eafdab1b940c314c8d3132
-DIST zabbix-3.0.20.tar.gz 15653766 BLAKE2B 
4c36611e6fa26f9f5a8e3201eea0f08f3c2945542284be0a823751ad39f51deffc450e1994bc685c6179d7e72bd3dd58e0071071cd02446d6d733cddf8d7f916
 SHA512 
06832600f31f13781b42083a56b8bca18f6a2034b6641b6809e338e374fa08dabbae6c9d54ee711b3dd2ac5017203fea3e0cbf7f70a1a1da60dda43c7e1af00c
-DIST zabbix-3.0.21.tar.gz 15658030 BLAKE2B 
8a943f015ba137c7a161439a31d09bf023bd02bf6ad420c8b02f316adedccf3b23df3775ecea7b27c5b4c893e881f2689cab1c28a4e6c1fe5b79ec08d5d86f43
 SHA512 
bffe02dac6f009ba8929e0d9ba222ae4bb9da05550f9eaff034fe444ee1c866bd231bb8aa814b7dedc01a5338171b40d461567a7bf619bfccfc523362db579a1
-DIST zabbix-3.0.22.tar.gz 15669417 BLAKE2B 
bef6a757324e68d61df8d892c94853ae7044cd66442cfaf2356e6f855af5d177b583aceaed14c31beb0c82e4134d089bfd7c4847c68e2c739f4e9e09a6cfb278
 SHA512 
fba82d22560c2aa1025b7d89a6ef50a02bda4c7f2408572f1b9624e8a703a798bf3188f9e8def261e564b8e74e63d4a5973e50f93d49058429d51b9699d110a8
 DIST zabbix-3.0.26.tar.gz 14724426 BLAKE2B 
d887f0dd77cf051e2b6ae16221c02c20aa3a7b8bee07eaff5a0837eb25962a4d0b42a9adace4d68d5e141fcd89a0896e3e2f64b6af5e28b2e63109a89791ced3
 SHA512 
de3ebee12a4be3b81d64fd0ce718866d55c9696da97f54c546c882f0e70656066c825c9383caf80fdf5ea6a6ac4801cb8ae88c1a83d9be051935111a72e31917
 DIST zabbix-3.2.11.tar.gz 16099820 BLAKE2B 
7038679ecc9ae1b6684d65b3dd0019865e587c82e5a3ffe55610c057f8516ebe34978101065ac31628e6fd54077877c447d64cb1d169e0ad7402e727c7e65d76
 SHA512 
a14e0af4b183c8deb524c8965700c2988c0c131844f7fbc748aa8d1703b9dad73c2cf6d77663799fbd455adf58fdd1ce8dc5fd6404a9269c1a42160ad0e33e6e
-DIST zabbix-3.4.10.tar.gz 17300622 BLAKE2B 
1b4c275d271ae4d4607400cb6e5f955ba624bf19cd116728e7a71a1b4adc0fbbde8cf91e6b0a71c5d48bf5c38b2ebe0db79f00ba3a42cc4213a0e310d56d5e29
 SHA512 
25e85cbe7a93a088fa0132ed6f3f75ad1aadedb839d745be38e180f0f9b858e32045b9d057b10cab4d3a8aa770b22b631aa0894fe5f1c3ca4ca62a000934bf94
-DIST zabbix-3.4.11.tar.gz 17517171 BLAKE2B 
72f7d1cad3e8cb7972cb9c3698d35f70c45de1244c14a87f403a0c2c9b1825d679fa32e54dc4b2aae80a24acb7723ce489e0d409fb027c1afc8bb4eccecf9867
 SHA512 
1360e1de02fbbda30539e0f1dbe9d4aee57bc693f597db011cdefe7e7c4acaa6e3452813ee29e0e614794336e7fc9210ff3458f3761fcec90db66fb4a2275373
-DIST zabbix-3.4.12.tar.gz 17509251 BLAKE2B 
158c7b3061059cc54a5988296404ed6670ca872fa8fa55f8de9708871ee03f163d0365420e23ef5df89a0a85e2f23d607952cf4fc02c974037555534ca164f08
 SHA512 
6707ff5a15d2c139775b4b5de32ceb4982c90aa4023af310ab9cb849895387984d32f59b7dc9fbaff8f317a630238437e4651ab8272b4535fb5fc3d88750e3ef
-DIST zabbix-3.4.13.tar.gz 17507365 BLAKE2B 
a5d1fa1a48df2ad66b844c2c85038a088ea5f7e3e67c2c3ab5f5d1ad695b3a31664d317e6a1cbf64d1f6a211304f50e5c38f5d973d4607f2caa202e1184420cf
 SHA512 
4edcf6d9df0f100c639efa6bc18e67ed59819e719a2226593fd81212d4c2e46a19cb50501cca005246b4c01c4082a18e21c9049a99ac9df263180a3c24fa52f0
-DIST zabbix-3.4.14.tar.gz 17476022 BLAKE2B 
9fccdf69bb74379fccfe044d68da8ce458e04c4686ae70a2fed5523309196b13fb022daa00d47ae9eb97a0774942efd766858dfe94890e20f38808ef2a3e3d15
 SHA512 
597ae107c16578ec2b1a364f2b61a7a7423a1cf39d3b04289e2f91dc0f931e796b566cbd451b14e026c35302120b647d6d574952a453189b066fb06081f9bb83
 DIST zabbix-3.4.15.tar.gz 17489570 BLAKE2B 
8b820e29334fa7814ab54baef75374955340cb907802722a4f91496a35c7a26fc1c37178c264f606f8a4a95cea350e493763e55f44033eb2aa97ec889664908a
 SHA512 
d210c6576a6c5d67a1f58bb51436c815a191a2ea62f6929784fcac6e0da09febdbb42c11dfb791b6a6d5897dbdda02e10bf56f9162b7f9fb34a57c34b8b1c62f
 DIST zabbix-4.0.6.tar.gz 17162202 BLAKE2B 
8f03830d5493719cbabd770527dfc99e1bd2d80a3eaeb691e07cd7d8bfe587317ee045ed13a297494539d3cc2e3a26bafe29cd6eb6126c7fe74ee5de44e98b39
 SHA512 
43b7ccadfaebc34098a827ef7e27c2c637d4bb74db4d06cdaee7650171b7b5e14787a473a66b638a252c1342e841b546e089bd762de703e99e0a34b0549393ca
 DIST zabbix-4.0.7.tar.gz 17175571 BLAKE2B 
3173881e093c58175e014d55c74d09656dbb6e99321f808a3ce6fe61aef56325aa94c4a3ff0b1edd2872734cc970052c63e5db377f8e8d605bf25f2eb8505802
 SHA512 
67373383ef961426901d8c27e1e51c902d8580b9af1877d4012c934f0ee52c5cf85e3f81fd16b244cd9c8e869cf13dbdd7597d8e2591356efc61570b354961f8

diff --git a/net-analyzer/zabbix/zabbix-3.0.19.ebuild 
b/net-analyzer/zabbix/zabbix-3.0.19.ebuild
deleted file mode 100644
index c3575d4f121..00000000000
--- a/net-analyzer/zabbix/zabbix-3.0.19.ebuild
+++ /dev/null
@@ -1,331 +0,0 @@
-# Copyright 1999-2018 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="https://www.zabbix.com/";
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz";
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle 
postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-       proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-       server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-       static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-       ldap? (
-               net-nds/openldap
-               =dev-libs/cyrus-sasl-2*
-               net-libs/gnutls
-       )
-       mysql? ( >=virtual/mysql-5.0.3 )
-       sqlite? ( >=dev-db/sqlite-3.3.5 )
-       postgres? ( dev-db/postgresql:* )
-       oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-       xmpp? ( dev-libs/iksemel )
-       libxml2? ( dev-libs/libxml2 )
-       curl? ( net-misc/curl )
-       openipmi? ( sys-libs/openipmi )
-       ssh? ( net-libs/libssh2 )
-       java? ( virtual/jdk:* )
-       odbc? ( dev-db/unixODBC )
-       ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
-       proxy? ( net-analyzer/fping )
-       server? ( net-analyzer/fping
-               app-admin/webapp-config )
-       java?   (
-               >=virtual/jre-1.4
-               dev-java/slf4j-api
-       )
-       frontend? (
-               
>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-               || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-               mysql? ( dev-lang/php[mysqli] )
-               odbc? ( dev-lang/php[odbc] )
-               oracle? ( dev-lang/php[oci8-instant-client] )
-               postgres? ( dev-lang/php[postgres] )
-               sqlite? ( dev-lang/php[sqlite] )
-               media-libs/gd[png]
-               app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-       static? (
-               ldap? (
-                       net-nds/openldap[static-libs]
-                       =dev-libs/cyrus-sasl-2*[static-libs]
-                       net-libs/gnutls[static-libs]
-               )
-       mysql? ( >=virtual/mysql-5.0.3[static-libs] )
-       sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-       postgres? ( dev-db/postgresql:*[static-libs] )
-       libxml2? ( dev-libs/libxml2[static-libs] )
-       curl? ( net-misc/curl[static-libs] )
-       ssh? ( net-libs/libssh2[static-libs] )
-       odbc? ( dev-db/unixODBC[static-libs] )
-       )
-       virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-       if use oracle; then
-               if [ -z "${ORACLE_HOME}" ]; then
-                       eerror
-                       eerror "The environment variable ORACLE_HOME must be 
set"
-                       eerror "and point to the correct location."
-                       eerror "It looks like you don't have Oracle installed."
-                       eerror
-                       die "Environment variable ORACLE_HOME is not set"
-               fi
-               if has_version 'dev-db/oracle-instantclient-basic'; then
-                       ewarn
-                       ewarn "Please ensure you have a full install of the 
Oracle client."
-                       ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-                       ewarn
-               fi
-       fi
-
-       if use frontend; then
-               webapp_pkg_setup
-       fi
-
-       enewgroup zabbix
-       enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-       cd "${S}/src/zabbix_java/lib"
-       rm -v *.jar || die
-
-       java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-       default
-}
-
-src_configure() {
-       econf \
-               $(use_enable server) \
-               $(use_enable proxy) \
-               $(use_enable agent) \
-               $(use_enable ipv6) \
-               $(use_enable static) \
-               $(use_enable java) \
-               $(use_with ldap) \
-               $(use_with snmp net-snmp) \
-               $(use_with mysql) \
-               $(use_with postgres postgresql) \
-               $(use_with oracle) \
-               $(use_with sqlite sqlite3) \
-               $(use_with xmpp jabber) \
-               $(use_with curl libcurl) \
-               $(use_with openipmi openipmi) \
-               $(use_with ssh ssh2) \
-               $(use_with libxml2) \
-               $(use_with odbc unixodbc) \
-               $(use_with ssl openssl) \
-               || die "econf failed"
-}
-
-src_compile() {
-       if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-               emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake 
failed"
-       fi
-}
-
-src_install() {
-       dodir \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-
-       keepdir \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-
-       if use server; then
-               insinto /etc/zabbix
-               doins "${FILESDIR}/3.0"/zabbix_server.conf
-               doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
-               dosbin src/zabbix_server/zabbix_server
-               fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-               fperms 0640 /etc/zabbix/zabbix_server.conf
-               dodir /usr/share/zabbix
-               /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-               systemd_dounit "${FILESDIR}/zabbix-server.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" 
zabbix-server.conf
-       fi
-
-       if use proxy; then
-               doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
-               dosbin src/zabbix_proxy/zabbix_proxy
-               insinto /etc/zabbix
-               doins "${FILESDIR}/3.0"/zabbix_proxy.conf
-               dodir /usr/share/zabbix
-               /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-               systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" 
zabbix-proxy.conf
-       fi
-
-       if use agent; then
-               insinto /etc/zabbix
-               doins "${FILESDIR}/3.0"/zabbix_agentd.conf
-               doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
-               dosbin src/zabbix_agent/zabbix_agentd
-               dobin \
-                       src/zabbix_sender/zabbix_sender \
-                       src/zabbix_get/zabbix_get
-               fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
-               fperms 0640 /etc/zabbix/zabbix_agentd.conf
-               systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" 
zabbix-agentd.conf
-       fi
-
-       fowners zabbix:zabbix \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-       fperms 0750 \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-
-       dodoc README INSTALL NEWS ChangeLog \
-               conf/zabbix_agentd.conf \
-               conf/zabbix_proxy.conf \
-               conf/zabbix_agentd/userparameter_examples.conf \
-               conf/zabbix_agentd/userparameter_mysql.conf \
-               conf/zabbix_server.conf
-
-       if use frontend; then
-               webapp_src_preinst
-               cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-               webapp_configfile \
-                       "${MY_HTDOCSDIR}"/include/db.inc.php \
-                       "${MY_HTDOCSDIR}"/include/config.inc.php
-               webapp_src_install
-       fi
-
-       if use java; then
-          dodir \
-               /${ZABBIXJAVA_BASE} \
-               /${ZABBIXJAVA_BASE}/bin \
-               /${ZABBIXJAVA_BASE}/lib
-          keepdir /${ZABBIXJAVA_BASE}
-          exeinto /${ZABBIXJAVA_BASE}/bin
-          doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-          exeinto /${ZABBIXJAVA_BASE}/lib
-          doexe \
-               src/zabbix_java/lib/logback-classic-0.9.27.jar \
-               src/zabbix_java/lib/logback-console.xml \
-               src/zabbix_java/lib/logback-core-0.9.27.jar \
-               src/zabbix_java/lib/logback.xml \
-               src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-               src/zabbix_java/lib/slf4j-api-1.6.1.jar
-          exeinto /${ZABBIXJAVA_BASE}/
-          doexe \
-               src/zabbix_java/settings.sh \
-               src/zabbix_java/startup.sh \
-               src/zabbix_java/shutdown.sh
-          fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-       fi
-}
-
-pkg_postinst() {
-       if use server || use proxy ; then
-               elog
-               elog "You may need to configure your database for Zabbix,"
-               elog "if you have not already done so. "
-               elog
-
-               zabbix_homedir=$(egethome zabbix)
-               if [ -n "${zabbix_homedir}" ] && \
-                  [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-                       ewarn
-                       ewarn "The user 'zabbix' should have his homedir 
changed"
-                       ewarn "to /var/lib/zabbix/home if you want to use"
-                       ewarn "custom alert scripts."
-                       ewarn
-                       ewarn "A real homedir might be needed for configfiles"
-                       ewarn "for custom alert scripts (e.g. ~/.sendxmpprc 
when"
-                       ewarn "using sendxmpp for Jabber alerts)."
-                       ewarn
-                       ewarn "To change the homedir use:"
-                       ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-                       ewarn
-               fi
-       fi
-
-       if use server; then
-               elog
-               elog "For distributed monitoring you have to run:"
-               elog
-               elog "zabbix_server -n <nodeid>"
-               elog
-               elog "This will convert database data for use with Node ID"
-               elog "and also adds a local node."
-               elog
-       fi
-
-       elog "--"
-       elog
-       elog "You may need to add these lines to /etc/services:"
-       elog
-       elog "zabbix-agent     10050/tcp Zabbix Agent"
-       elog "zabbix-agent     10050/udp Zabbix Agent"
-       elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-       elog "zabbix-trapper   10051/udp Zabbix Trapper"
-       elog
-
-       if use server || use proxy ; then
-               # check for fping
-               fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-               case "${fping_perms}" in
-                       4[157][157][157])
-                               ;;
-                       *)
-                               ewarn
-                               ewarn "If you want to use the checks 'icmpping' 
and 'icmppingsec',"
-                               ewarn "you have to make /usr/sbin/fping setuid 
root and executable"
-                               ewarn "by everyone. Run the following command 
to fix it:"
-                               ewarn
-                               ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-                               ewarn
-                               ewarn "Please be aware that this might impose a 
security risk,"
-                               ewarn "depending on the code quality of fping."
-                               ewarn
-                               ;;
-               esac
-       fi
-}

diff --git a/net-analyzer/zabbix/zabbix-3.0.20.ebuild 
b/net-analyzer/zabbix/zabbix-3.0.20.ebuild
deleted file mode 100644
index c3575d4f121..00000000000
--- a/net-analyzer/zabbix/zabbix-3.0.20.ebuild
+++ /dev/null
@@ -1,331 +0,0 @@
-# Copyright 1999-2018 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="https://www.zabbix.com/";
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz";
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle 
postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-       proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-       server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-       static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-       ldap? (
-               net-nds/openldap
-               =dev-libs/cyrus-sasl-2*
-               net-libs/gnutls
-       )
-       mysql? ( >=virtual/mysql-5.0.3 )
-       sqlite? ( >=dev-db/sqlite-3.3.5 )
-       postgres? ( dev-db/postgresql:* )
-       oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-       xmpp? ( dev-libs/iksemel )
-       libxml2? ( dev-libs/libxml2 )
-       curl? ( net-misc/curl )
-       openipmi? ( sys-libs/openipmi )
-       ssh? ( net-libs/libssh2 )
-       java? ( virtual/jdk:* )
-       odbc? ( dev-db/unixODBC )
-       ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
-       proxy? ( net-analyzer/fping )
-       server? ( net-analyzer/fping
-               app-admin/webapp-config )
-       java?   (
-               >=virtual/jre-1.4
-               dev-java/slf4j-api
-       )
-       frontend? (
-               
>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-               || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-               mysql? ( dev-lang/php[mysqli] )
-               odbc? ( dev-lang/php[odbc] )
-               oracle? ( dev-lang/php[oci8-instant-client] )
-               postgres? ( dev-lang/php[postgres] )
-               sqlite? ( dev-lang/php[sqlite] )
-               media-libs/gd[png]
-               app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-       static? (
-               ldap? (
-                       net-nds/openldap[static-libs]
-                       =dev-libs/cyrus-sasl-2*[static-libs]
-                       net-libs/gnutls[static-libs]
-               )
-       mysql? ( >=virtual/mysql-5.0.3[static-libs] )
-       sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-       postgres? ( dev-db/postgresql:*[static-libs] )
-       libxml2? ( dev-libs/libxml2[static-libs] )
-       curl? ( net-misc/curl[static-libs] )
-       ssh? ( net-libs/libssh2[static-libs] )
-       odbc? ( dev-db/unixODBC[static-libs] )
-       )
-       virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-       if use oracle; then
-               if [ -z "${ORACLE_HOME}" ]; then
-                       eerror
-                       eerror "The environment variable ORACLE_HOME must be 
set"
-                       eerror "and point to the correct location."
-                       eerror "It looks like you don't have Oracle installed."
-                       eerror
-                       die "Environment variable ORACLE_HOME is not set"
-               fi
-               if has_version 'dev-db/oracle-instantclient-basic'; then
-                       ewarn
-                       ewarn "Please ensure you have a full install of the 
Oracle client."
-                       ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-                       ewarn
-               fi
-       fi
-
-       if use frontend; then
-               webapp_pkg_setup
-       fi
-
-       enewgroup zabbix
-       enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-       cd "${S}/src/zabbix_java/lib"
-       rm -v *.jar || die
-
-       java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-       default
-}
-
-src_configure() {
-       econf \
-               $(use_enable server) \
-               $(use_enable proxy) \
-               $(use_enable agent) \
-               $(use_enable ipv6) \
-               $(use_enable static) \
-               $(use_enable java) \
-               $(use_with ldap) \
-               $(use_with snmp net-snmp) \
-               $(use_with mysql) \
-               $(use_with postgres postgresql) \
-               $(use_with oracle) \
-               $(use_with sqlite sqlite3) \
-               $(use_with xmpp jabber) \
-               $(use_with curl libcurl) \
-               $(use_with openipmi openipmi) \
-               $(use_with ssh ssh2) \
-               $(use_with libxml2) \
-               $(use_with odbc unixodbc) \
-               $(use_with ssl openssl) \
-               || die "econf failed"
-}
-
-src_compile() {
-       if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-               emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake 
failed"
-       fi
-}
-
-src_install() {
-       dodir \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-
-       keepdir \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-
-       if use server; then
-               insinto /etc/zabbix
-               doins "${FILESDIR}/3.0"/zabbix_server.conf
-               doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
-               dosbin src/zabbix_server/zabbix_server
-               fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-               fperms 0640 /etc/zabbix/zabbix_server.conf
-               dodir /usr/share/zabbix
-               /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-               systemd_dounit "${FILESDIR}/zabbix-server.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" 
zabbix-server.conf
-       fi
-
-       if use proxy; then
-               doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
-               dosbin src/zabbix_proxy/zabbix_proxy
-               insinto /etc/zabbix
-               doins "${FILESDIR}/3.0"/zabbix_proxy.conf
-               dodir /usr/share/zabbix
-               /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-               systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" 
zabbix-proxy.conf
-       fi
-
-       if use agent; then
-               insinto /etc/zabbix
-               doins "${FILESDIR}/3.0"/zabbix_agentd.conf
-               doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
-               dosbin src/zabbix_agent/zabbix_agentd
-               dobin \
-                       src/zabbix_sender/zabbix_sender \
-                       src/zabbix_get/zabbix_get
-               fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
-               fperms 0640 /etc/zabbix/zabbix_agentd.conf
-               systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" 
zabbix-agentd.conf
-       fi
-
-       fowners zabbix:zabbix \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-       fperms 0750 \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-
-       dodoc README INSTALL NEWS ChangeLog \
-               conf/zabbix_agentd.conf \
-               conf/zabbix_proxy.conf \
-               conf/zabbix_agentd/userparameter_examples.conf \
-               conf/zabbix_agentd/userparameter_mysql.conf \
-               conf/zabbix_server.conf
-
-       if use frontend; then
-               webapp_src_preinst
-               cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-               webapp_configfile \
-                       "${MY_HTDOCSDIR}"/include/db.inc.php \
-                       "${MY_HTDOCSDIR}"/include/config.inc.php
-               webapp_src_install
-       fi
-
-       if use java; then
-          dodir \
-               /${ZABBIXJAVA_BASE} \
-               /${ZABBIXJAVA_BASE}/bin \
-               /${ZABBIXJAVA_BASE}/lib
-          keepdir /${ZABBIXJAVA_BASE}
-          exeinto /${ZABBIXJAVA_BASE}/bin
-          doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-          exeinto /${ZABBIXJAVA_BASE}/lib
-          doexe \
-               src/zabbix_java/lib/logback-classic-0.9.27.jar \
-               src/zabbix_java/lib/logback-console.xml \
-               src/zabbix_java/lib/logback-core-0.9.27.jar \
-               src/zabbix_java/lib/logback.xml \
-               src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-               src/zabbix_java/lib/slf4j-api-1.6.1.jar
-          exeinto /${ZABBIXJAVA_BASE}/
-          doexe \
-               src/zabbix_java/settings.sh \
-               src/zabbix_java/startup.sh \
-               src/zabbix_java/shutdown.sh
-          fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-       fi
-}
-
-pkg_postinst() {
-       if use server || use proxy ; then
-               elog
-               elog "You may need to configure your database for Zabbix,"
-               elog "if you have not already done so. "
-               elog
-
-               zabbix_homedir=$(egethome zabbix)
-               if [ -n "${zabbix_homedir}" ] && \
-                  [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-                       ewarn
-                       ewarn "The user 'zabbix' should have his homedir 
changed"
-                       ewarn "to /var/lib/zabbix/home if you want to use"
-                       ewarn "custom alert scripts."
-                       ewarn
-                       ewarn "A real homedir might be needed for configfiles"
-                       ewarn "for custom alert scripts (e.g. ~/.sendxmpprc 
when"
-                       ewarn "using sendxmpp for Jabber alerts)."
-                       ewarn
-                       ewarn "To change the homedir use:"
-                       ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-                       ewarn
-               fi
-       fi
-
-       if use server; then
-               elog
-               elog "For distributed monitoring you have to run:"
-               elog
-               elog "zabbix_server -n <nodeid>"
-               elog
-               elog "This will convert database data for use with Node ID"
-               elog "and also adds a local node."
-               elog
-       fi
-
-       elog "--"
-       elog
-       elog "You may need to add these lines to /etc/services:"
-       elog
-       elog "zabbix-agent     10050/tcp Zabbix Agent"
-       elog "zabbix-agent     10050/udp Zabbix Agent"
-       elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-       elog "zabbix-trapper   10051/udp Zabbix Trapper"
-       elog
-
-       if use server || use proxy ; then
-               # check for fping
-               fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-               case "${fping_perms}" in
-                       4[157][157][157])
-                               ;;
-                       *)
-                               ewarn
-                               ewarn "If you want to use the checks 'icmpping' 
and 'icmppingsec',"
-                               ewarn "you have to make /usr/sbin/fping setuid 
root and executable"
-                               ewarn "by everyone. Run the following command 
to fix it:"
-                               ewarn
-                               ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-                               ewarn
-                               ewarn "Please be aware that this might impose a 
security risk,"
-                               ewarn "depending on the code quality of fping."
-                               ewarn
-                               ;;
-               esac
-       fi
-}

diff --git a/net-analyzer/zabbix/zabbix-3.0.21.ebuild 
b/net-analyzer/zabbix/zabbix-3.0.21.ebuild
deleted file mode 100644
index c3575d4f121..00000000000
--- a/net-analyzer/zabbix/zabbix-3.0.21.ebuild
+++ /dev/null
@@ -1,331 +0,0 @@
-# Copyright 1999-2018 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="https://www.zabbix.com/";
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz";
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle 
postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-       proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-       server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-       static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-       ldap? (
-               net-nds/openldap
-               =dev-libs/cyrus-sasl-2*
-               net-libs/gnutls
-       )
-       mysql? ( >=virtual/mysql-5.0.3 )
-       sqlite? ( >=dev-db/sqlite-3.3.5 )
-       postgres? ( dev-db/postgresql:* )
-       oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-       xmpp? ( dev-libs/iksemel )
-       libxml2? ( dev-libs/libxml2 )
-       curl? ( net-misc/curl )
-       openipmi? ( sys-libs/openipmi )
-       ssh? ( net-libs/libssh2 )
-       java? ( virtual/jdk:* )
-       odbc? ( dev-db/unixODBC )
-       ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
-       proxy? ( net-analyzer/fping )
-       server? ( net-analyzer/fping
-               app-admin/webapp-config )
-       java?   (
-               >=virtual/jre-1.4
-               dev-java/slf4j-api
-       )
-       frontend? (
-               
>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-               || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-               mysql? ( dev-lang/php[mysqli] )
-               odbc? ( dev-lang/php[odbc] )
-               oracle? ( dev-lang/php[oci8-instant-client] )
-               postgres? ( dev-lang/php[postgres] )
-               sqlite? ( dev-lang/php[sqlite] )
-               media-libs/gd[png]
-               app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-       static? (
-               ldap? (
-                       net-nds/openldap[static-libs]
-                       =dev-libs/cyrus-sasl-2*[static-libs]
-                       net-libs/gnutls[static-libs]
-               )
-       mysql? ( >=virtual/mysql-5.0.3[static-libs] )
-       sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-       postgres? ( dev-db/postgresql:*[static-libs] )
-       libxml2? ( dev-libs/libxml2[static-libs] )
-       curl? ( net-misc/curl[static-libs] )
-       ssh? ( net-libs/libssh2[static-libs] )
-       odbc? ( dev-db/unixODBC[static-libs] )
-       )
-       virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-       if use oracle; then
-               if [ -z "${ORACLE_HOME}" ]; then
-                       eerror
-                       eerror "The environment variable ORACLE_HOME must be 
set"
-                       eerror "and point to the correct location."
-                       eerror "It looks like you don't have Oracle installed."
-                       eerror
-                       die "Environment variable ORACLE_HOME is not set"
-               fi
-               if has_version 'dev-db/oracle-instantclient-basic'; then
-                       ewarn
-                       ewarn "Please ensure you have a full install of the 
Oracle client."
-                       ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-                       ewarn
-               fi
-       fi
-
-       if use frontend; then
-               webapp_pkg_setup
-       fi
-
-       enewgroup zabbix
-       enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-       cd "${S}/src/zabbix_java/lib"
-       rm -v *.jar || die
-
-       java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-       default
-}
-
-src_configure() {
-       econf \
-               $(use_enable server) \
-               $(use_enable proxy) \
-               $(use_enable agent) \
-               $(use_enable ipv6) \
-               $(use_enable static) \
-               $(use_enable java) \
-               $(use_with ldap) \
-               $(use_with snmp net-snmp) \
-               $(use_with mysql) \
-               $(use_with postgres postgresql) \
-               $(use_with oracle) \
-               $(use_with sqlite sqlite3) \
-               $(use_with xmpp jabber) \
-               $(use_with curl libcurl) \
-               $(use_with openipmi openipmi) \
-               $(use_with ssh ssh2) \
-               $(use_with libxml2) \
-               $(use_with odbc unixodbc) \
-               $(use_with ssl openssl) \
-               || die "econf failed"
-}
-
-src_compile() {
-       if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-               emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake 
failed"
-       fi
-}
-
-src_install() {
-       dodir \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-
-       keepdir \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-
-       if use server; then
-               insinto /etc/zabbix
-               doins "${FILESDIR}/3.0"/zabbix_server.conf
-               doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
-               dosbin src/zabbix_server/zabbix_server
-               fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-               fperms 0640 /etc/zabbix/zabbix_server.conf
-               dodir /usr/share/zabbix
-               /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-               systemd_dounit "${FILESDIR}/zabbix-server.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" 
zabbix-server.conf
-       fi
-
-       if use proxy; then
-               doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
-               dosbin src/zabbix_proxy/zabbix_proxy
-               insinto /etc/zabbix
-               doins "${FILESDIR}/3.0"/zabbix_proxy.conf
-               dodir /usr/share/zabbix
-               /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-               systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" 
zabbix-proxy.conf
-       fi
-
-       if use agent; then
-               insinto /etc/zabbix
-               doins "${FILESDIR}/3.0"/zabbix_agentd.conf
-               doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
-               dosbin src/zabbix_agent/zabbix_agentd
-               dobin \
-                       src/zabbix_sender/zabbix_sender \
-                       src/zabbix_get/zabbix_get
-               fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
-               fperms 0640 /etc/zabbix/zabbix_agentd.conf
-               systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" 
zabbix-agentd.conf
-       fi
-
-       fowners zabbix:zabbix \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-       fperms 0750 \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-
-       dodoc README INSTALL NEWS ChangeLog \
-               conf/zabbix_agentd.conf \
-               conf/zabbix_proxy.conf \
-               conf/zabbix_agentd/userparameter_examples.conf \
-               conf/zabbix_agentd/userparameter_mysql.conf \
-               conf/zabbix_server.conf
-
-       if use frontend; then
-               webapp_src_preinst
-               cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-               webapp_configfile \
-                       "${MY_HTDOCSDIR}"/include/db.inc.php \
-                       "${MY_HTDOCSDIR}"/include/config.inc.php
-               webapp_src_install
-       fi
-
-       if use java; then
-          dodir \
-               /${ZABBIXJAVA_BASE} \
-               /${ZABBIXJAVA_BASE}/bin \
-               /${ZABBIXJAVA_BASE}/lib
-          keepdir /${ZABBIXJAVA_BASE}
-          exeinto /${ZABBIXJAVA_BASE}/bin
-          doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-          exeinto /${ZABBIXJAVA_BASE}/lib
-          doexe \
-               src/zabbix_java/lib/logback-classic-0.9.27.jar \
-               src/zabbix_java/lib/logback-console.xml \
-               src/zabbix_java/lib/logback-core-0.9.27.jar \
-               src/zabbix_java/lib/logback.xml \
-               src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-               src/zabbix_java/lib/slf4j-api-1.6.1.jar
-          exeinto /${ZABBIXJAVA_BASE}/
-          doexe \
-               src/zabbix_java/settings.sh \
-               src/zabbix_java/startup.sh \
-               src/zabbix_java/shutdown.sh
-          fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-       fi
-}
-
-pkg_postinst() {
-       if use server || use proxy ; then
-               elog
-               elog "You may need to configure your database for Zabbix,"
-               elog "if you have not already done so. "
-               elog
-
-               zabbix_homedir=$(egethome zabbix)
-               if [ -n "${zabbix_homedir}" ] && \
-                  [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-                       ewarn
-                       ewarn "The user 'zabbix' should have his homedir 
changed"
-                       ewarn "to /var/lib/zabbix/home if you want to use"
-                       ewarn "custom alert scripts."
-                       ewarn
-                       ewarn "A real homedir might be needed for configfiles"
-                       ewarn "for custom alert scripts (e.g. ~/.sendxmpprc 
when"
-                       ewarn "using sendxmpp for Jabber alerts)."
-                       ewarn
-                       ewarn "To change the homedir use:"
-                       ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-                       ewarn
-               fi
-       fi
-
-       if use server; then
-               elog
-               elog "For distributed monitoring you have to run:"
-               elog
-               elog "zabbix_server -n <nodeid>"
-               elog
-               elog "This will convert database data for use with Node ID"
-               elog "and also adds a local node."
-               elog
-       fi
-
-       elog "--"
-       elog
-       elog "You may need to add these lines to /etc/services:"
-       elog
-       elog "zabbix-agent     10050/tcp Zabbix Agent"
-       elog "zabbix-agent     10050/udp Zabbix Agent"
-       elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-       elog "zabbix-trapper   10051/udp Zabbix Trapper"
-       elog
-
-       if use server || use proxy ; then
-               # check for fping
-               fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-               case "${fping_perms}" in
-                       4[157][157][157])
-                               ;;
-                       *)
-                               ewarn
-                               ewarn "If you want to use the checks 'icmpping' 
and 'icmppingsec',"
-                               ewarn "you have to make /usr/sbin/fping setuid 
root and executable"
-                               ewarn "by everyone. Run the following command 
to fix it:"
-                               ewarn
-                               ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-                               ewarn
-                               ewarn "Please be aware that this might impose a 
security risk,"
-                               ewarn "depending on the code quality of fping."
-                               ewarn
-                               ;;
-               esac
-       fi
-}

diff --git a/net-analyzer/zabbix/zabbix-3.0.22.ebuild 
b/net-analyzer/zabbix/zabbix-3.0.22.ebuild
deleted file mode 100644
index bacf8eaf426..00000000000
--- a/net-analyzer/zabbix/zabbix-3.0.22.ebuild
+++ /dev/null
@@ -1,331 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network 
and servers"
-HOMEPAGE="https://www.zabbix.com/";
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz";
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle 
postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-       proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-       server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-       static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-       ldap? (
-               net-nds/openldap
-               =dev-libs/cyrus-sasl-2*
-               net-libs/gnutls
-       )
-       mysql? ( >=virtual/mysql-5.0.3 )
-       sqlite? ( >=dev-db/sqlite-3.3.5 )
-       postgres? ( dev-db/postgresql:* )
-       oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-       xmpp? ( dev-libs/iksemel )
-       libxml2? ( dev-libs/libxml2 )
-       curl? ( net-misc/curl )
-       openipmi? ( sys-libs/openipmi )
-       ssh? ( net-libs/libssh2 )
-       java? ( virtual/jdk:* )
-       odbc? ( dev-db/unixODBC )
-       ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
-       proxy? ( net-analyzer/fping )
-       server? ( net-analyzer/fping
-               app-admin/webapp-config )
-       java?   (
-               >=virtual/jre-1.4
-               dev-java/slf4j-api
-       )
-       frontend? (
-               
>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-               || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-               mysql? ( dev-lang/php[mysqli] )
-               odbc? ( dev-lang/php[odbc] )
-               oracle? ( dev-lang/php[oci8-instant-client] )
-               postgres? ( dev-lang/php[postgres] )
-               sqlite? ( dev-lang/php[sqlite] )
-               media-libs/gd[png]
-               app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-       static? (
-               ldap? (
-                       net-nds/openldap[static-libs]
-                       =dev-libs/cyrus-sasl-2*[static-libs]
-                       net-libs/gnutls[static-libs]
-               )
-       mysql? ( >=virtual/mysql-5.0.3[static-libs] )
-       sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-       postgres? ( dev-db/postgresql:*[static-libs] )
-       libxml2? ( dev-libs/libxml2[static-libs] )
-       curl? ( net-misc/curl[static-libs] )
-       ssh? ( net-libs/libssh2[static-libs] )
-       odbc? ( dev-db/unixODBC[static-libs] )
-       )
-       virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-       if use oracle; then
-               if [ -z "${ORACLE_HOME}" ]; then
-                       eerror
-                       eerror "The environment variable ORACLE_HOME must be 
set"
-                       eerror "and point to the correct location."
-                       eerror "It looks like you don't have Oracle installed."
-                       eerror
-                       die "Environment variable ORACLE_HOME is not set"
-               fi
-               if has_version 'dev-db/oracle-instantclient-basic'; then
-                       ewarn
-                       ewarn "Please ensure you have a full install of the 
Oracle client."
-                       ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-                       ewarn
-               fi
-       fi
-
-       if use frontend; then
-               webapp_pkg_setup
-       fi
-
-       enewgroup zabbix
-       enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-       cd "${S}/src/zabbix_java/lib"
-       rm -v *.jar || die
-
-       java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-       default
-}
-
-src_configure() {
-       econf \
-               $(use_enable server) \
-               $(use_enable proxy) \
-               $(use_enable agent) \
-               $(use_enable ipv6) \
-               $(use_enable static) \
-               $(use_enable java) \
-               $(use_with ldap) \
-               $(use_with snmp net-snmp) \
-               $(use_with mysql) \
-               $(use_with postgres postgresql) \
-               $(use_with oracle) \
-               $(use_with sqlite sqlite3) \
-               $(use_with xmpp jabber) \
-               $(use_with curl libcurl) \
-               $(use_with openipmi openipmi) \
-               $(use_with ssh ssh2) \
-               $(use_with libxml2) \
-               $(use_with odbc unixodbc) \
-               $(use_with ssl openssl) \
-               || die "econf failed"
-}
-
-src_compile() {
-       if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-               emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake 
failed"
-       fi
-}
-
-src_install() {
-       dodir \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-
-       keepdir \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-
-       if use server; then
-               insinto /etc/zabbix
-               doins "${FILESDIR}/3.0"/zabbix_server.conf
-               doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
-               dosbin src/zabbix_server/zabbix_server
-               fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-               fperms 0640 /etc/zabbix/zabbix_server.conf
-               dodir /usr/share/zabbix
-               /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-               systemd_dounit "${FILESDIR}/zabbix-server.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" 
zabbix-server.conf
-       fi
-
-       if use proxy; then
-               doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
-               dosbin src/zabbix_proxy/zabbix_proxy
-               insinto /etc/zabbix
-               doins "${FILESDIR}/3.0"/zabbix_proxy.conf
-               dodir /usr/share/zabbix
-               /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-               systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" 
zabbix-proxy.conf
-       fi
-
-       if use agent; then
-               insinto /etc/zabbix
-               doins "${FILESDIR}/3.0"/zabbix_agentd.conf
-               doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
-               dosbin src/zabbix_agent/zabbix_agentd
-               dobin \
-                       src/zabbix_sender/zabbix_sender \
-                       src/zabbix_get/zabbix_get
-               fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
-               fperms 0640 /etc/zabbix/zabbix_agentd.conf
-               systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" 
zabbix-agentd.conf
-       fi
-
-       fowners zabbix:zabbix \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-       fperms 0750 \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-
-       dodoc README INSTALL NEWS ChangeLog \
-               conf/zabbix_agentd.conf \
-               conf/zabbix_proxy.conf \
-               conf/zabbix_agentd/userparameter_examples.conf \
-               conf/zabbix_agentd/userparameter_mysql.conf \
-               conf/zabbix_server.conf
-
-       if use frontend; then
-               webapp_src_preinst
-               cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-               webapp_configfile \
-                       "${MY_HTDOCSDIR}"/include/db.inc.php \
-                       "${MY_HTDOCSDIR}"/include/config.inc.php
-               webapp_src_install
-       fi
-
-       if use java; then
-          dodir \
-               /${ZABBIXJAVA_BASE} \
-               /${ZABBIXJAVA_BASE}/bin \
-               /${ZABBIXJAVA_BASE}/lib
-          keepdir /${ZABBIXJAVA_BASE}
-          exeinto /${ZABBIXJAVA_BASE}/bin
-          doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-          exeinto /${ZABBIXJAVA_BASE}/lib
-          doexe \
-               src/zabbix_java/lib/logback-classic-0.9.27.jar \
-               src/zabbix_java/lib/logback-console.xml \
-               src/zabbix_java/lib/logback-core-0.9.27.jar \
-               src/zabbix_java/lib/logback.xml \
-               src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-               src/zabbix_java/lib/slf4j-api-1.6.1.jar
-          exeinto /${ZABBIXJAVA_BASE}/
-          doexe \
-               src/zabbix_java/settings.sh \
-               src/zabbix_java/startup.sh \
-               src/zabbix_java/shutdown.sh
-          fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-       fi
-}
-
-pkg_postinst() {
-       if use server || use proxy ; then
-               elog
-               elog "You may need to configure your database for Zabbix,"
-               elog "if you have not already done so. "
-               elog
-
-               zabbix_homedir=$(egethome zabbix)
-               if [ -n "${zabbix_homedir}" ] && \
-                  [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-                       ewarn
-                       ewarn "The user 'zabbix' should have his homedir 
changed"
-                       ewarn "to /var/lib/zabbix/home if you want to use"
-                       ewarn "custom alert scripts."
-                       ewarn
-                       ewarn "A real homedir might be needed for configfiles"
-                       ewarn "for custom alert scripts (e.g. ~/.sendxmpprc 
when"
-                       ewarn "using sendxmpp for Jabber alerts)."
-                       ewarn
-                       ewarn "To change the homedir use:"
-                       ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-                       ewarn
-               fi
-       fi
-
-       if use server; then
-               elog
-               elog "For distributed monitoring you have to run:"
-               elog
-               elog "zabbix_server -n <nodeid>"
-               elog
-               elog "This will convert database data for use with Node ID"
-               elog "and also adds a local node."
-               elog
-       fi
-
-       elog "--"
-       elog
-       elog "You may need to add these lines to /etc/services:"
-       elog
-       elog "zabbix-agent     10050/tcp Zabbix Agent"
-       elog "zabbix-agent     10050/udp Zabbix Agent"
-       elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-       elog "zabbix-trapper   10051/udp Zabbix Trapper"
-       elog
-
-       if use server || use proxy ; then
-               # check for fping
-               fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-               case "${fping_perms}" in
-                       4[157][157][157])
-                               ;;
-                       *)
-                               ewarn
-                               ewarn "If you want to use the checks 'icmpping' 
and 'icmppingsec',"
-                               ewarn "you have to make /usr/sbin/fping setuid 
root and executable"
-                               ewarn "by everyone. Run the following command 
to fix it:"
-                               ewarn
-                               ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-                               ewarn
-                               ewarn "Please be aware that this might impose a 
security risk,"
-                               ewarn "depending on the code quality of fping."
-                               ewarn
-                               ;;
-               esac
-       fi
-}

diff --git a/net-analyzer/zabbix/zabbix-3.4.10.ebuild 
b/net-analyzer/zabbix/zabbix-3.4.10.ebuild
deleted file mode 100644
index 94b8bc3cdff..00000000000
--- a/net-analyzer/zabbix/zabbix-3.4.10.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2018 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="https://www.zabbix.com/";
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz";
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle 
+postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-       proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-       server? ( ^^ ( mysql oracle postgres odbc ) )
-       static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-       ldap? (
-               net-nds/openldap
-               =dev-libs/cyrus-sasl-2*
-               net-libs/gnutls
-       )
-       mysql? ( >=virtual/mysql-5.0.3 )
-       sqlite? ( >=dev-db/sqlite-3.3.5 )
-       postgres? ( dev-db/postgresql:* )
-       oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-       xmpp? ( dev-libs/iksemel )
-       libxml2? ( dev-libs/libxml2 )
-       curl? ( net-misc/curl )
-       openipmi? ( sys-libs/openipmi )
-       ssh? ( net-libs/libssh2 )
-       java? ( virtual/jdk:* )
-       odbc? ( dev-db/unixODBC )
-       ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
-       proxy? ( net-analyzer/fping[suid] )
-       server? ( net-analyzer/fping[suid]
-               app-admin/webapp-config
-               dev-libs/libevent )
-       java?   (
-               >=virtual/jre-1.4
-               dev-java/slf4j-api
-       )
-       frontend? (
-               
>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-               || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-               mysql? ( dev-lang/php[mysqli] )
-               odbc? ( dev-lang/php[odbc] )
-               oracle? ( dev-lang/php[oci8-instant-client] )
-               postgres? ( dev-lang/php[postgres] )
-               sqlite? ( dev-lang/php[sqlite] )
-               media-libs/gd[png]
-               app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-       static? (
-               ldap? (
-                       net-nds/openldap[static-libs]
-                       =dev-libs/cyrus-sasl-2*[static-libs]
-                       net-libs/gnutls[static-libs]
-               )
-       mysql? ( >=virtual/mysql-5.0.3[static-libs] )
-       sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-       postgres? ( dev-db/postgresql:*[static-libs] )
-       libxml2? ( dev-libs/libxml2[static-libs] )
-       curl? ( net-misc/curl[static-libs] )
-       ssh? ( net-libs/libssh2[static-libs] )
-       odbc? ( dev-db/unixODBC[static-libs] )
-       )
-       virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-       if use oracle; then
-               if [ -z "${ORACLE_HOME}" ]; then
-                       eerror
-                       eerror "The environment variable ORACLE_HOME must be 
set"
-                       eerror "and point to the correct location."
-                       eerror "It looks like you don't have Oracle installed."
-                       eerror
-                       die "Environment variable ORACLE_HOME is not set"
-               fi
-               if has_version 'dev-db/oracle-instantclient-basic'; then
-                       ewarn
-                       ewarn "Please ensure you have a full install of the 
Oracle client."
-                       ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-                       ewarn
-               fi
-       fi
-
-       if use frontend; then
-               webapp_pkg_setup
-       fi
-
-       enewgroup zabbix
-       enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-       cd "${S}/src/zabbix_java/lib"
-       rm -v *.jar || die
-
-       java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-       default
-}
-
-src_configure() {
-       econf \
-               $(use_enable server) \
-               $(use_enable proxy) \
-               $(use_enable agent) \
-               $(use_enable ipv6) \
-               $(use_enable static) \
-               $(use_enable java) \
-               $(use_with ldap) \
-               $(use_with snmp net-snmp) \
-               $(use_with mysql) \
-               $(use_with postgres postgresql) \
-               $(use_with oracle) \
-               $(use_with sqlite sqlite3) \
-               $(use_with xmpp jabber) \
-               $(use_with curl libcurl) \
-               $(use_with openipmi openipmi) \
-               $(use_with ssh ssh2) \
-               $(use_with libxml2) \
-               $(use_with odbc unixodbc) \
-               $(use_with ssl openssl) \
-               || die "econf failed"
-}
-
-src_compile() {
-       if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-               emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake 
failed"
-       fi
-}
-
-src_install() {
-       dodir \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-
-       keepdir \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-
-       if use server; then
-               insinto /etc/zabbix
-               doins "${FILESDIR}/3.0"/zabbix_server.conf
-               doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
-               dosbin src/zabbix_server/zabbix_server
-               fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-               fperms 0640 /etc/zabbix/zabbix_server.conf
-               dodir /usr/share/zabbix
-               /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-               systemd_dounit "${FILESDIR}/zabbix-server.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" 
zabbix-server.conf
-       fi
-
-       if use proxy; then
-               doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
-               dosbin src/zabbix_proxy/zabbix_proxy
-               insinto /etc/zabbix
-               doins "${FILESDIR}/3.0"/zabbix_proxy.conf
-               dodir /usr/share/zabbix
-               /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-               systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" 
zabbix-proxy.conf
-       fi
-
-       if use agent; then
-               insinto /etc/zabbix
-               doins "${FILESDIR}/3.0"/zabbix_agentd.conf
-               doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
-               dosbin src/zabbix_agent/zabbix_agentd
-               dobin \
-                       src/zabbix_sender/zabbix_sender \
-                       src/zabbix_get/zabbix_get
-               fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
-               fperms 0640 /etc/zabbix/zabbix_agentd.conf
-               systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" 
zabbix-agentd.conf
-       fi
-
-       fowners zabbix:zabbix \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-       fperms 0750 \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-
-       dodoc README INSTALL NEWS ChangeLog \
-               conf/zabbix_agentd.conf \
-               conf/zabbix_proxy.conf \
-               conf/zabbix_agentd/userparameter_examples.conf \
-               conf/zabbix_agentd/userparameter_mysql.conf \
-               conf/zabbix_server.conf
-
-       if use frontend; then
-               webapp_src_preinst
-               cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-               webapp_configfile \
-                       "${MY_HTDOCSDIR}"/include/db.inc.php \
-                       "${MY_HTDOCSDIR}"/include/config.inc.php
-               webapp_src_install
-       fi
-
-       if use java; then
-               dodir \
-                       /${ZABBIXJAVA_BASE} \
-                       /${ZABBIXJAVA_BASE}/bin \
-                       /${ZABBIXJAVA_BASE}/lib
-               keepdir /${ZABBIXJAVA_BASE}
-               exeinto /${ZABBIXJAVA_BASE}/bin
-               doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-               exeinto /${ZABBIXJAVA_BASE}/lib
-               doexe \
-                       src/zabbix_java/lib/logback-classic-0.9.27.jar \
-                       src/zabbix_java/lib/logback-console.xml \
-                       src/zabbix_java/lib/logback-core-0.9.27.jar \
-                       src/zabbix_java/lib/logback.xml \
-                       src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-                       src/zabbix_java/lib/slf4j-api-1.6.1.jar
-               fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-               doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
-               doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
-       fi
-}
-
-pkg_postinst() {
-       if use server || use proxy ; then
-               elog
-               elog "You may need to configure your database for Zabbix,"
-               elog "if you have not already done so. "
-               elog
-
-               zabbix_homedir=$(egethome zabbix)
-               if [ -n "${zabbix_homedir}" ] && \
-                  [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-                       ewarn
-                       ewarn "The user 'zabbix' should have his homedir 
changed"
-                       ewarn "to /var/lib/zabbix/home if you want to use"
-                       ewarn "custom alert scripts."
-                       ewarn
-                       ewarn "A real homedir might be needed for configfiles"
-                       ewarn "for custom alert scripts (e.g. ~/.sendxmpprc 
when"
-                       ewarn "using sendxmpp for Jabber alerts)."
-                       ewarn
-                       ewarn "To change the homedir use:"
-                       ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-                       ewarn
-               fi
-       fi
-
-       if use server; then
-               elog
-               elog "For distributed monitoring you have to run:"
-               elog
-               elog "zabbix_server -n <nodeid>"
-               elog
-               elog "This will convert database data for use with Node ID"
-               elog "and also adds a local node."
-               elog
-       fi
-
-       elog "--"
-       elog
-       elog "You may need to add these lines to /etc/services:"
-       elog
-       elog "zabbix-agent     10050/tcp Zabbix Agent"
-       elog "zabbix-agent     10050/udp Zabbix Agent"
-       elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-       elog "zabbix-trapper   10051/udp Zabbix Trapper"
-       elog
-
-       if use server || use proxy ; then
-               # check for fping
-               fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-               case "${fping_perms}" in
-                       4[157][157][157])
-                               ;;
-                       *)
-                               ewarn
-                               ewarn "If you want to use the checks 'icmpping' 
and 'icmppingsec',"
-                               ewarn "you have to make /usr/sbin/fping setuid 
root and executable"
-                               ewarn "by everyone. Run the following command 
to fix it:"
-                               ewarn
-                               ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-                               ewarn
-                               ewarn "Please be aware that this might impose a 
security risk,"
-                               ewarn "depending on the code quality of fping."
-                               ewarn
-                               ;;
-               esac
-       fi
-}

diff --git a/net-analyzer/zabbix/zabbix-3.4.11.ebuild 
b/net-analyzer/zabbix/zabbix-3.4.11.ebuild
deleted file mode 100644
index 94b8bc3cdff..00000000000
--- a/net-analyzer/zabbix/zabbix-3.4.11.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2018 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="https://www.zabbix.com/";
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz";
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle 
+postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-       proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-       server? ( ^^ ( mysql oracle postgres odbc ) )
-       static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-       ldap? (
-               net-nds/openldap
-               =dev-libs/cyrus-sasl-2*
-               net-libs/gnutls
-       )
-       mysql? ( >=virtual/mysql-5.0.3 )
-       sqlite? ( >=dev-db/sqlite-3.3.5 )
-       postgres? ( dev-db/postgresql:* )
-       oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-       xmpp? ( dev-libs/iksemel )
-       libxml2? ( dev-libs/libxml2 )
-       curl? ( net-misc/curl )
-       openipmi? ( sys-libs/openipmi )
-       ssh? ( net-libs/libssh2 )
-       java? ( virtual/jdk:* )
-       odbc? ( dev-db/unixODBC )
-       ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
-       proxy? ( net-analyzer/fping[suid] )
-       server? ( net-analyzer/fping[suid]
-               app-admin/webapp-config
-               dev-libs/libevent )
-       java?   (
-               >=virtual/jre-1.4
-               dev-java/slf4j-api
-       )
-       frontend? (
-               
>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-               || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-               mysql? ( dev-lang/php[mysqli] )
-               odbc? ( dev-lang/php[odbc] )
-               oracle? ( dev-lang/php[oci8-instant-client] )
-               postgres? ( dev-lang/php[postgres] )
-               sqlite? ( dev-lang/php[sqlite] )
-               media-libs/gd[png]
-               app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-       static? (
-               ldap? (
-                       net-nds/openldap[static-libs]
-                       =dev-libs/cyrus-sasl-2*[static-libs]
-                       net-libs/gnutls[static-libs]
-               )
-       mysql? ( >=virtual/mysql-5.0.3[static-libs] )
-       sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-       postgres? ( dev-db/postgresql:*[static-libs] )
-       libxml2? ( dev-libs/libxml2[static-libs] )
-       curl? ( net-misc/curl[static-libs] )
-       ssh? ( net-libs/libssh2[static-libs] )
-       odbc? ( dev-db/unixODBC[static-libs] )
-       )
-       virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-       if use oracle; then
-               if [ -z "${ORACLE_HOME}" ]; then
-                       eerror
-                       eerror "The environment variable ORACLE_HOME must be 
set"
-                       eerror "and point to the correct location."
-                       eerror "It looks like you don't have Oracle installed."
-                       eerror
-                       die "Environment variable ORACLE_HOME is not set"
-               fi
-               if has_version 'dev-db/oracle-instantclient-basic'; then
-                       ewarn
-                       ewarn "Please ensure you have a full install of the 
Oracle client."
-                       ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-                       ewarn
-               fi
-       fi
-
-       if use frontend; then
-               webapp_pkg_setup
-       fi
-
-       enewgroup zabbix
-       enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-       cd "${S}/src/zabbix_java/lib"
-       rm -v *.jar || die
-
-       java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-       default
-}
-
-src_configure() {
-       econf \
-               $(use_enable server) \
-               $(use_enable proxy) \
-               $(use_enable agent) \
-               $(use_enable ipv6) \
-               $(use_enable static) \
-               $(use_enable java) \
-               $(use_with ldap) \
-               $(use_with snmp net-snmp) \
-               $(use_with mysql) \
-               $(use_with postgres postgresql) \
-               $(use_with oracle) \
-               $(use_with sqlite sqlite3) \
-               $(use_with xmpp jabber) \
-               $(use_with curl libcurl) \
-               $(use_with openipmi openipmi) \
-               $(use_with ssh ssh2) \
-               $(use_with libxml2) \
-               $(use_with odbc unixodbc) \
-               $(use_with ssl openssl) \
-               || die "econf failed"
-}
-
-src_compile() {
-       if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-               emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake 
failed"
-       fi
-}
-
-src_install() {
-       dodir \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-
-       keepdir \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-
-       if use server; then
-               insinto /etc/zabbix
-               doins "${FILESDIR}/3.0"/zabbix_server.conf
-               doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
-               dosbin src/zabbix_server/zabbix_server
-               fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-               fperms 0640 /etc/zabbix/zabbix_server.conf
-               dodir /usr/share/zabbix
-               /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-               systemd_dounit "${FILESDIR}/zabbix-server.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" 
zabbix-server.conf
-       fi
-
-       if use proxy; then
-               doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
-               dosbin src/zabbix_proxy/zabbix_proxy
-               insinto /etc/zabbix
-               doins "${FILESDIR}/3.0"/zabbix_proxy.conf
-               dodir /usr/share/zabbix
-               /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-               systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" 
zabbix-proxy.conf
-       fi
-
-       if use agent; then
-               insinto /etc/zabbix
-               doins "${FILESDIR}/3.0"/zabbix_agentd.conf
-               doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
-               dosbin src/zabbix_agent/zabbix_agentd
-               dobin \
-                       src/zabbix_sender/zabbix_sender \
-                       src/zabbix_get/zabbix_get
-               fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
-               fperms 0640 /etc/zabbix/zabbix_agentd.conf
-               systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" 
zabbix-agentd.conf
-       fi
-
-       fowners zabbix:zabbix \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-       fperms 0750 \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-
-       dodoc README INSTALL NEWS ChangeLog \
-               conf/zabbix_agentd.conf \
-               conf/zabbix_proxy.conf \
-               conf/zabbix_agentd/userparameter_examples.conf \
-               conf/zabbix_agentd/userparameter_mysql.conf \
-               conf/zabbix_server.conf
-
-       if use frontend; then
-               webapp_src_preinst
-               cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-               webapp_configfile \
-                       "${MY_HTDOCSDIR}"/include/db.inc.php \
-                       "${MY_HTDOCSDIR}"/include/config.inc.php
-               webapp_src_install
-       fi
-
-       if use java; then
-               dodir \
-                       /${ZABBIXJAVA_BASE} \
-                       /${ZABBIXJAVA_BASE}/bin \
-                       /${ZABBIXJAVA_BASE}/lib
-               keepdir /${ZABBIXJAVA_BASE}
-               exeinto /${ZABBIXJAVA_BASE}/bin
-               doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-               exeinto /${ZABBIXJAVA_BASE}/lib
-               doexe \
-                       src/zabbix_java/lib/logback-classic-0.9.27.jar \
-                       src/zabbix_java/lib/logback-console.xml \
-                       src/zabbix_java/lib/logback-core-0.9.27.jar \
-                       src/zabbix_java/lib/logback.xml \
-                       src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-                       src/zabbix_java/lib/slf4j-api-1.6.1.jar
-               fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-               doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
-               doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
-       fi
-}
-
-pkg_postinst() {
-       if use server || use proxy ; then
-               elog
-               elog "You may need to configure your database for Zabbix,"
-               elog "if you have not already done so. "
-               elog
-
-               zabbix_homedir=$(egethome zabbix)
-               if [ -n "${zabbix_homedir}" ] && \
-                  [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-                       ewarn
-                       ewarn "The user 'zabbix' should have his homedir 
changed"
-                       ewarn "to /var/lib/zabbix/home if you want to use"
-                       ewarn "custom alert scripts."
-                       ewarn
-                       ewarn "A real homedir might be needed for configfiles"
-                       ewarn "for custom alert scripts (e.g. ~/.sendxmpprc 
when"
-                       ewarn "using sendxmpp for Jabber alerts)."
-                       ewarn
-                       ewarn "To change the homedir use:"
-                       ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-                       ewarn
-               fi
-       fi
-
-       if use server; then
-               elog
-               elog "For distributed monitoring you have to run:"
-               elog
-               elog "zabbix_server -n <nodeid>"
-               elog
-               elog "This will convert database data for use with Node ID"
-               elog "and also adds a local node."
-               elog
-       fi
-
-       elog "--"
-       elog
-       elog "You may need to add these lines to /etc/services:"
-       elog
-       elog "zabbix-agent     10050/tcp Zabbix Agent"
-       elog "zabbix-agent     10050/udp Zabbix Agent"
-       elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-       elog "zabbix-trapper   10051/udp Zabbix Trapper"
-       elog
-
-       if use server || use proxy ; then
-               # check for fping
-               fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-               case "${fping_perms}" in
-                       4[157][157][157])
-                               ;;
-                       *)
-                               ewarn
-                               ewarn "If you want to use the checks 'icmpping' 
and 'icmppingsec',"
-                               ewarn "you have to make /usr/sbin/fping setuid 
root and executable"
-                               ewarn "by everyone. Run the following command 
to fix it:"
-                               ewarn
-                               ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-                               ewarn
-                               ewarn "Please be aware that this might impose a 
security risk,"
-                               ewarn "depending on the code quality of fping."
-                               ewarn
-                               ;;
-               esac
-       fi
-}

diff --git a/net-analyzer/zabbix/zabbix-3.4.12.ebuild 
b/net-analyzer/zabbix/zabbix-3.4.12.ebuild
deleted file mode 100644
index 94b8bc3cdff..00000000000
--- a/net-analyzer/zabbix/zabbix-3.4.12.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2018 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="https://www.zabbix.com/";
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz";
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle 
+postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-       proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-       server? ( ^^ ( mysql oracle postgres odbc ) )
-       static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-       ldap? (
-               net-nds/openldap
-               =dev-libs/cyrus-sasl-2*
-               net-libs/gnutls
-       )
-       mysql? ( >=virtual/mysql-5.0.3 )
-       sqlite? ( >=dev-db/sqlite-3.3.5 )
-       postgres? ( dev-db/postgresql:* )
-       oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-       xmpp? ( dev-libs/iksemel )
-       libxml2? ( dev-libs/libxml2 )
-       curl? ( net-misc/curl )
-       openipmi? ( sys-libs/openipmi )
-       ssh? ( net-libs/libssh2 )
-       java? ( virtual/jdk:* )
-       odbc? ( dev-db/unixODBC )
-       ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
-       proxy? ( net-analyzer/fping[suid] )
-       server? ( net-analyzer/fping[suid]
-               app-admin/webapp-config
-               dev-libs/libevent )
-       java?   (
-               >=virtual/jre-1.4
-               dev-java/slf4j-api
-       )
-       frontend? (
-               
>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-               || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-               mysql? ( dev-lang/php[mysqli] )
-               odbc? ( dev-lang/php[odbc] )
-               oracle? ( dev-lang/php[oci8-instant-client] )
-               postgres? ( dev-lang/php[postgres] )
-               sqlite? ( dev-lang/php[sqlite] )
-               media-libs/gd[png]
-               app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-       static? (
-               ldap? (
-                       net-nds/openldap[static-libs]
-                       =dev-libs/cyrus-sasl-2*[static-libs]
-                       net-libs/gnutls[static-libs]
-               )
-       mysql? ( >=virtual/mysql-5.0.3[static-libs] )
-       sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-       postgres? ( dev-db/postgresql:*[static-libs] )
-       libxml2? ( dev-libs/libxml2[static-libs] )
-       curl? ( net-misc/curl[static-libs] )
-       ssh? ( net-libs/libssh2[static-libs] )
-       odbc? ( dev-db/unixODBC[static-libs] )
-       )
-       virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-       if use oracle; then
-               if [ -z "${ORACLE_HOME}" ]; then
-                       eerror
-                       eerror "The environment variable ORACLE_HOME must be 
set"
-                       eerror "and point to the correct location."
-                       eerror "It looks like you don't have Oracle installed."
-                       eerror
-                       die "Environment variable ORACLE_HOME is not set"
-               fi
-               if has_version 'dev-db/oracle-instantclient-basic'; then
-                       ewarn
-                       ewarn "Please ensure you have a full install of the 
Oracle client."
-                       ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-                       ewarn
-               fi
-       fi
-
-       if use frontend; then
-               webapp_pkg_setup
-       fi
-
-       enewgroup zabbix
-       enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-       cd "${S}/src/zabbix_java/lib"
-       rm -v *.jar || die
-
-       java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-       default
-}
-
-src_configure() {
-       econf \
-               $(use_enable server) \
-               $(use_enable proxy) \
-               $(use_enable agent) \
-               $(use_enable ipv6) \
-               $(use_enable static) \
-               $(use_enable java) \
-               $(use_with ldap) \
-               $(use_with snmp net-snmp) \
-               $(use_with mysql) \
-               $(use_with postgres postgresql) \
-               $(use_with oracle) \
-               $(use_with sqlite sqlite3) \
-               $(use_with xmpp jabber) \
-               $(use_with curl libcurl) \
-               $(use_with openipmi openipmi) \
-               $(use_with ssh ssh2) \
-               $(use_with libxml2) \
-               $(use_with odbc unixodbc) \
-               $(use_with ssl openssl) \
-               || die "econf failed"
-}
-
-src_compile() {
-       if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-               emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake 
failed"
-       fi
-}
-
-src_install() {
-       dodir \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-
-       keepdir \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-
-       if use server; then
-               insinto /etc/zabbix
-               doins "${FILESDIR}/3.0"/zabbix_server.conf
-               doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
-               dosbin src/zabbix_server/zabbix_server
-               fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-               fperms 0640 /etc/zabbix/zabbix_server.conf
-               dodir /usr/share/zabbix
-               /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-               systemd_dounit "${FILESDIR}/zabbix-server.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" 
zabbix-server.conf
-       fi
-
-       if use proxy; then
-               doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
-               dosbin src/zabbix_proxy/zabbix_proxy
-               insinto /etc/zabbix
-               doins "${FILESDIR}/3.0"/zabbix_proxy.conf
-               dodir /usr/share/zabbix
-               /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-               systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" 
zabbix-proxy.conf
-       fi
-
-       if use agent; then
-               insinto /etc/zabbix
-               doins "${FILESDIR}/3.0"/zabbix_agentd.conf
-               doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
-               dosbin src/zabbix_agent/zabbix_agentd
-               dobin \
-                       src/zabbix_sender/zabbix_sender \
-                       src/zabbix_get/zabbix_get
-               fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
-               fperms 0640 /etc/zabbix/zabbix_agentd.conf
-               systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" 
zabbix-agentd.conf
-       fi
-
-       fowners zabbix:zabbix \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-       fperms 0750 \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-
-       dodoc README INSTALL NEWS ChangeLog \
-               conf/zabbix_agentd.conf \
-               conf/zabbix_proxy.conf \
-               conf/zabbix_agentd/userparameter_examples.conf \
-               conf/zabbix_agentd/userparameter_mysql.conf \
-               conf/zabbix_server.conf
-
-       if use frontend; then
-               webapp_src_preinst
-               cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-               webapp_configfile \
-                       "${MY_HTDOCSDIR}"/include/db.inc.php \
-                       "${MY_HTDOCSDIR}"/include/config.inc.php
-               webapp_src_install
-       fi
-
-       if use java; then
-               dodir \
-                       /${ZABBIXJAVA_BASE} \
-                       /${ZABBIXJAVA_BASE}/bin \
-                       /${ZABBIXJAVA_BASE}/lib
-               keepdir /${ZABBIXJAVA_BASE}
-               exeinto /${ZABBIXJAVA_BASE}/bin
-               doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-               exeinto /${ZABBIXJAVA_BASE}/lib
-               doexe \
-                       src/zabbix_java/lib/logback-classic-0.9.27.jar \
-                       src/zabbix_java/lib/logback-console.xml \
-                       src/zabbix_java/lib/logback-core-0.9.27.jar \
-                       src/zabbix_java/lib/logback.xml \
-                       src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-                       src/zabbix_java/lib/slf4j-api-1.6.1.jar
-               fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-               doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
-               doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
-       fi
-}
-
-pkg_postinst() {
-       if use server || use proxy ; then
-               elog
-               elog "You may need to configure your database for Zabbix,"
-               elog "if you have not already done so. "
-               elog
-
-               zabbix_homedir=$(egethome zabbix)
-               if [ -n "${zabbix_homedir}" ] && \
-                  [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-                       ewarn
-                       ewarn "The user 'zabbix' should have his homedir 
changed"
-                       ewarn "to /var/lib/zabbix/home if you want to use"
-                       ewarn "custom alert scripts."
-                       ewarn
-                       ewarn "A real homedir might be needed for configfiles"
-                       ewarn "for custom alert scripts (e.g. ~/.sendxmpprc 
when"
-                       ewarn "using sendxmpp for Jabber alerts)."
-                       ewarn
-                       ewarn "To change the homedir use:"
-                       ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-                       ewarn
-               fi
-       fi
-
-       if use server; then
-               elog
-               elog "For distributed monitoring you have to run:"
-               elog
-               elog "zabbix_server -n <nodeid>"
-               elog
-               elog "This will convert database data for use with Node ID"
-               elog "and also adds a local node."
-               elog
-       fi
-
-       elog "--"
-       elog
-       elog "You may need to add these lines to /etc/services:"
-       elog
-       elog "zabbix-agent     10050/tcp Zabbix Agent"
-       elog "zabbix-agent     10050/udp Zabbix Agent"
-       elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-       elog "zabbix-trapper   10051/udp Zabbix Trapper"
-       elog
-
-       if use server || use proxy ; then
-               # check for fping
-               fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-               case "${fping_perms}" in
-                       4[157][157][157])
-                               ;;
-                       *)
-                               ewarn
-                               ewarn "If you want to use the checks 'icmpping' 
and 'icmppingsec',"
-                               ewarn "you have to make /usr/sbin/fping setuid 
root and executable"
-                               ewarn "by everyone. Run the following command 
to fix it:"
-                               ewarn
-                               ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-                               ewarn
-                               ewarn "Please be aware that this might impose a 
security risk,"
-                               ewarn "depending on the code quality of fping."
-                               ewarn
-                               ;;
-               esac
-       fi
-}

diff --git a/net-analyzer/zabbix/zabbix-3.4.13.ebuild 
b/net-analyzer/zabbix/zabbix-3.4.13.ebuild
deleted file mode 100644
index 94b8bc3cdff..00000000000
--- a/net-analyzer/zabbix/zabbix-3.4.13.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2018 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="https://www.zabbix.com/";
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz";
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle 
+postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-       proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-       server? ( ^^ ( mysql oracle postgres odbc ) )
-       static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-       ldap? (
-               net-nds/openldap
-               =dev-libs/cyrus-sasl-2*
-               net-libs/gnutls
-       )
-       mysql? ( >=virtual/mysql-5.0.3 )
-       sqlite? ( >=dev-db/sqlite-3.3.5 )
-       postgres? ( dev-db/postgresql:* )
-       oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-       xmpp? ( dev-libs/iksemel )
-       libxml2? ( dev-libs/libxml2 )
-       curl? ( net-misc/curl )
-       openipmi? ( sys-libs/openipmi )
-       ssh? ( net-libs/libssh2 )
-       java? ( virtual/jdk:* )
-       odbc? ( dev-db/unixODBC )
-       ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
-       proxy? ( net-analyzer/fping[suid] )
-       server? ( net-analyzer/fping[suid]
-               app-admin/webapp-config
-               dev-libs/libevent )
-       java?   (
-               >=virtual/jre-1.4
-               dev-java/slf4j-api
-       )
-       frontend? (
-               
>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-               || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-               mysql? ( dev-lang/php[mysqli] )
-               odbc? ( dev-lang/php[odbc] )
-               oracle? ( dev-lang/php[oci8-instant-client] )
-               postgres? ( dev-lang/php[postgres] )
-               sqlite? ( dev-lang/php[sqlite] )
-               media-libs/gd[png]
-               app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-       static? (
-               ldap? (
-                       net-nds/openldap[static-libs]
-                       =dev-libs/cyrus-sasl-2*[static-libs]
-                       net-libs/gnutls[static-libs]
-               )
-       mysql? ( >=virtual/mysql-5.0.3[static-libs] )
-       sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-       postgres? ( dev-db/postgresql:*[static-libs] )
-       libxml2? ( dev-libs/libxml2[static-libs] )
-       curl? ( net-misc/curl[static-libs] )
-       ssh? ( net-libs/libssh2[static-libs] )
-       odbc? ( dev-db/unixODBC[static-libs] )
-       )
-       virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-       if use oracle; then
-               if [ -z "${ORACLE_HOME}" ]; then
-                       eerror
-                       eerror "The environment variable ORACLE_HOME must be 
set"
-                       eerror "and point to the correct location."
-                       eerror "It looks like you don't have Oracle installed."
-                       eerror
-                       die "Environment variable ORACLE_HOME is not set"
-               fi
-               if has_version 'dev-db/oracle-instantclient-basic'; then
-                       ewarn
-                       ewarn "Please ensure you have a full install of the 
Oracle client."
-                       ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-                       ewarn
-               fi
-       fi
-
-       if use frontend; then
-               webapp_pkg_setup
-       fi
-
-       enewgroup zabbix
-       enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-       cd "${S}/src/zabbix_java/lib"
-       rm -v *.jar || die
-
-       java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-       default
-}
-
-src_configure() {
-       econf \
-               $(use_enable server) \
-               $(use_enable proxy) \
-               $(use_enable agent) \
-               $(use_enable ipv6) \
-               $(use_enable static) \
-               $(use_enable java) \
-               $(use_with ldap) \
-               $(use_with snmp net-snmp) \
-               $(use_with mysql) \
-               $(use_with postgres postgresql) \
-               $(use_with oracle) \
-               $(use_with sqlite sqlite3) \
-               $(use_with xmpp jabber) \
-               $(use_with curl libcurl) \
-               $(use_with openipmi openipmi) \
-               $(use_with ssh ssh2) \
-               $(use_with libxml2) \
-               $(use_with odbc unixodbc) \
-               $(use_with ssl openssl) \
-               || die "econf failed"
-}
-
-src_compile() {
-       if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-               emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake 
failed"
-       fi
-}
-
-src_install() {
-       dodir \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-
-       keepdir \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-
-       if use server; then
-               insinto /etc/zabbix
-               doins "${FILESDIR}/3.0"/zabbix_server.conf
-               doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
-               dosbin src/zabbix_server/zabbix_server
-               fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-               fperms 0640 /etc/zabbix/zabbix_server.conf
-               dodir /usr/share/zabbix
-               /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-               systemd_dounit "${FILESDIR}/zabbix-server.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" 
zabbix-server.conf
-       fi
-
-       if use proxy; then
-               doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
-               dosbin src/zabbix_proxy/zabbix_proxy
-               insinto /etc/zabbix
-               doins "${FILESDIR}/3.0"/zabbix_proxy.conf
-               dodir /usr/share/zabbix
-               /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-               systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" 
zabbix-proxy.conf
-       fi
-
-       if use agent; then
-               insinto /etc/zabbix
-               doins "${FILESDIR}/3.0"/zabbix_agentd.conf
-               doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
-               dosbin src/zabbix_agent/zabbix_agentd
-               dobin \
-                       src/zabbix_sender/zabbix_sender \
-                       src/zabbix_get/zabbix_get
-               fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
-               fperms 0640 /etc/zabbix/zabbix_agentd.conf
-               systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" 
zabbix-agentd.conf
-       fi
-
-       fowners zabbix:zabbix \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-       fperms 0750 \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-
-       dodoc README INSTALL NEWS ChangeLog \
-               conf/zabbix_agentd.conf \
-               conf/zabbix_proxy.conf \
-               conf/zabbix_agentd/userparameter_examples.conf \
-               conf/zabbix_agentd/userparameter_mysql.conf \
-               conf/zabbix_server.conf
-
-       if use frontend; then
-               webapp_src_preinst
-               cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-               webapp_configfile \
-                       "${MY_HTDOCSDIR}"/include/db.inc.php \
-                       "${MY_HTDOCSDIR}"/include/config.inc.php
-               webapp_src_install
-       fi
-
-       if use java; then
-               dodir \
-                       /${ZABBIXJAVA_BASE} \
-                       /${ZABBIXJAVA_BASE}/bin \
-                       /${ZABBIXJAVA_BASE}/lib
-               keepdir /${ZABBIXJAVA_BASE}
-               exeinto /${ZABBIXJAVA_BASE}/bin
-               doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-               exeinto /${ZABBIXJAVA_BASE}/lib
-               doexe \
-                       src/zabbix_java/lib/logback-classic-0.9.27.jar \
-                       src/zabbix_java/lib/logback-console.xml \
-                       src/zabbix_java/lib/logback-core-0.9.27.jar \
-                       src/zabbix_java/lib/logback.xml \
-                       src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-                       src/zabbix_java/lib/slf4j-api-1.6.1.jar
-               fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-               doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
-               doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
-       fi
-}
-
-pkg_postinst() {
-       if use server || use proxy ; then
-               elog
-               elog "You may need to configure your database for Zabbix,"
-               elog "if you have not already done so. "
-               elog
-
-               zabbix_homedir=$(egethome zabbix)
-               if [ -n "${zabbix_homedir}" ] && \
-                  [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-                       ewarn
-                       ewarn "The user 'zabbix' should have his homedir 
changed"
-                       ewarn "to /var/lib/zabbix/home if you want to use"
-                       ewarn "custom alert scripts."
-                       ewarn
-                       ewarn "A real homedir might be needed for configfiles"
-                       ewarn "for custom alert scripts (e.g. ~/.sendxmpprc 
when"
-                       ewarn "using sendxmpp for Jabber alerts)."
-                       ewarn
-                       ewarn "To change the homedir use:"
-                       ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-                       ewarn
-               fi
-       fi
-
-       if use server; then
-               elog
-               elog "For distributed monitoring you have to run:"
-               elog
-               elog "zabbix_server -n <nodeid>"
-               elog
-               elog "This will convert database data for use with Node ID"
-               elog "and also adds a local node."
-               elog
-       fi
-
-       elog "--"
-       elog
-       elog "You may need to add these lines to /etc/services:"
-       elog
-       elog "zabbix-agent     10050/tcp Zabbix Agent"
-       elog "zabbix-agent     10050/udp Zabbix Agent"
-       elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-       elog "zabbix-trapper   10051/udp Zabbix Trapper"
-       elog
-
-       if use server || use proxy ; then
-               # check for fping
-               fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-               case "${fping_perms}" in
-                       4[157][157][157])
-                               ;;
-                       *)
-                               ewarn
-                               ewarn "If you want to use the checks 'icmpping' 
and 'icmppingsec',"
-                               ewarn "you have to make /usr/sbin/fping setuid 
root and executable"
-                               ewarn "by everyone. Run the following command 
to fix it:"
-                               ewarn
-                               ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-                               ewarn
-                               ewarn "Please be aware that this might impose a 
security risk,"
-                               ewarn "depending on the code quality of fping."
-                               ewarn
-                               ;;
-               esac
-       fi
-}

diff --git a/net-analyzer/zabbix/zabbix-3.4.14.ebuild 
b/net-analyzer/zabbix/zabbix-3.4.14.ebuild
deleted file mode 100644
index dd57544e3c4..00000000000
--- a/net-analyzer/zabbix/zabbix-3.4.14.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network 
and servers"
-HOMEPAGE="https://www.zabbix.com/";
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz";
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle 
+postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-       proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-       server? ( ^^ ( mysql oracle postgres odbc ) )
-       static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-       ldap? (
-               net-nds/openldap
-               =dev-libs/cyrus-sasl-2*
-               net-libs/gnutls
-       )
-       mysql? ( >=virtual/mysql-5.0.3 )
-       sqlite? ( >=dev-db/sqlite-3.3.5 )
-       postgres? ( dev-db/postgresql:* )
-       oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-       xmpp? ( dev-libs/iksemel )
-       libxml2? ( dev-libs/libxml2 )
-       curl? ( net-misc/curl )
-       openipmi? ( sys-libs/openipmi )
-       ssh? ( net-libs/libssh2 )
-       java? ( virtual/jdk:* )
-       odbc? ( dev-db/unixODBC )
-       ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
-       proxy? ( net-analyzer/fping[suid] )
-       server? ( net-analyzer/fping[suid]
-               app-admin/webapp-config
-               dev-libs/libevent )
-       java?   (
-               >=virtual/jre-1.4
-               dev-java/slf4j-api
-       )
-       frontend? (
-               
>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-               || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-               mysql? ( dev-lang/php[mysqli] )
-               odbc? ( dev-lang/php[odbc] )
-               oracle? ( dev-lang/php[oci8-instant-client] )
-               postgres? ( dev-lang/php[postgres] )
-               sqlite? ( dev-lang/php[sqlite] )
-               media-libs/gd[png]
-               app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-       static? (
-               ldap? (
-                       net-nds/openldap[static-libs]
-                       =dev-libs/cyrus-sasl-2*[static-libs]
-                       net-libs/gnutls[static-libs]
-               )
-       mysql? ( >=virtual/mysql-5.0.3[static-libs] )
-       sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-       postgres? ( dev-db/postgresql:*[static-libs] )
-       libxml2? ( dev-libs/libxml2[static-libs] )
-       curl? ( net-misc/curl[static-libs] )
-       ssh? ( net-libs/libssh2[static-libs] )
-       odbc? ( dev-db/unixODBC[static-libs] )
-       )
-       virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-       if use oracle; then
-               if [ -z "${ORACLE_HOME}" ]; then
-                       eerror
-                       eerror "The environment variable ORACLE_HOME must be 
set"
-                       eerror "and point to the correct location."
-                       eerror "It looks like you don't have Oracle installed."
-                       eerror
-                       die "Environment variable ORACLE_HOME is not set"
-               fi
-               if has_version 'dev-db/oracle-instantclient-basic'; then
-                       ewarn
-                       ewarn "Please ensure you have a full install of the 
Oracle client."
-                       ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-                       ewarn
-               fi
-       fi
-
-       if use frontend; then
-               webapp_pkg_setup
-       fi
-
-       enewgroup zabbix
-       enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-       cd "${S}/src/zabbix_java/lib"
-       rm -v *.jar || die
-
-       java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-       default
-}
-
-src_configure() {
-       econf \
-               $(use_enable server) \
-               $(use_enable proxy) \
-               $(use_enable agent) \
-               $(use_enable ipv6) \
-               $(use_enable static) \
-               $(use_enable java) \
-               $(use_with ldap) \
-               $(use_with snmp net-snmp) \
-               $(use_with mysql) \
-               $(use_with postgres postgresql) \
-               $(use_with oracle) \
-               $(use_with sqlite sqlite3) \
-               $(use_with xmpp jabber) \
-               $(use_with curl libcurl) \
-               $(use_with openipmi openipmi) \
-               $(use_with ssh ssh2) \
-               $(use_with libxml2) \
-               $(use_with odbc unixodbc) \
-               $(use_with ssl openssl) \
-               || die "econf failed"
-}
-
-src_compile() {
-       if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-               emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake 
failed"
-       fi
-}
-
-src_install() {
-       dodir \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-
-       keepdir \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-
-       if use server; then
-               insinto /etc/zabbix
-               doins "${FILESDIR}/3.0"/zabbix_server.conf
-               doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
-               dosbin src/zabbix_server/zabbix_server
-               fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-               fperms 0640 /etc/zabbix/zabbix_server.conf
-               dodir /usr/share/zabbix
-               /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-               systemd_dounit "${FILESDIR}/zabbix-server.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" 
zabbix-server.conf
-       fi
-
-       if use proxy; then
-               doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
-               dosbin src/zabbix_proxy/zabbix_proxy
-               insinto /etc/zabbix
-               doins "${FILESDIR}/3.0"/zabbix_proxy.conf
-               dodir /usr/share/zabbix
-               /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-               systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" 
zabbix-proxy.conf
-       fi
-
-       if use agent; then
-               insinto /etc/zabbix
-               doins "${FILESDIR}/3.0"/zabbix_agentd.conf
-               doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
-               dosbin src/zabbix_agent/zabbix_agentd
-               dobin \
-                       src/zabbix_sender/zabbix_sender \
-                       src/zabbix_get/zabbix_get
-               fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
-               fperms 0640 /etc/zabbix/zabbix_agentd.conf
-               systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" 
zabbix-agentd.conf
-       fi
-
-       fowners zabbix:zabbix \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-       fperms 0750 \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-
-       dodoc README INSTALL NEWS ChangeLog \
-               conf/zabbix_agentd.conf \
-               conf/zabbix_proxy.conf \
-               conf/zabbix_agentd/userparameter_examples.conf \
-               conf/zabbix_agentd/userparameter_mysql.conf \
-               conf/zabbix_server.conf
-
-       if use frontend; then
-               webapp_src_preinst
-               cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-               webapp_configfile \
-                       "${MY_HTDOCSDIR}"/include/db.inc.php \
-                       "${MY_HTDOCSDIR}"/include/config.inc.php
-               webapp_src_install
-       fi
-
-       if use java; then
-               dodir \
-                       /${ZABBIXJAVA_BASE} \
-                       /${ZABBIXJAVA_BASE}/bin \
-                       /${ZABBIXJAVA_BASE}/lib
-               keepdir /${ZABBIXJAVA_BASE}
-               exeinto /${ZABBIXJAVA_BASE}/bin
-               doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-               exeinto /${ZABBIXJAVA_BASE}/lib
-               doexe \
-                       src/zabbix_java/lib/logback-classic-0.9.27.jar \
-                       src/zabbix_java/lib/logback-console.xml \
-                       src/zabbix_java/lib/logback-core-0.9.27.jar \
-                       src/zabbix_java/lib/logback.xml \
-                       src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-                       src/zabbix_java/lib/slf4j-api-1.6.1.jar
-               fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-               doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
-               doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
-       fi
-}
-
-pkg_postinst() {
-       if use server || use proxy ; then
-               elog
-               elog "You may need to configure your database for Zabbix,"
-               elog "if you have not already done so. "
-               elog
-
-               zabbix_homedir=$(egethome zabbix)
-               if [ -n "${zabbix_homedir}" ] && \
-                  [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-                       ewarn
-                       ewarn "The user 'zabbix' should have his homedir 
changed"
-                       ewarn "to /var/lib/zabbix/home if you want to use"
-                       ewarn "custom alert scripts."
-                       ewarn
-                       ewarn "A real homedir might be needed for configfiles"
-                       ewarn "for custom alert scripts (e.g. ~/.sendxmpprc 
when"
-                       ewarn "using sendxmpp for Jabber alerts)."
-                       ewarn
-                       ewarn "To change the homedir use:"
-                       ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-                       ewarn
-               fi
-       fi
-
-       if use server; then
-               elog
-               elog "For distributed monitoring you have to run:"
-               elog
-               elog "zabbix_server -n <nodeid>"
-               elog
-               elog "This will convert database data for use with Node ID"
-               elog "and also adds a local node."
-               elog
-       fi
-
-       elog "--"
-       elog
-       elog "You may need to add these lines to /etc/services:"
-       elog
-       elog "zabbix-agent     10050/tcp Zabbix Agent"
-       elog "zabbix-agent     10050/udp Zabbix Agent"
-       elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-       elog "zabbix-trapper   10051/udp Zabbix Trapper"
-       elog
-
-       if use server || use proxy ; then
-               # check for fping
-               fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-               case "${fping_perms}" in
-                       4[157][157][157])
-                               ;;
-                       *)
-                               ewarn
-                               ewarn "If you want to use the checks 'icmpping' 
and 'icmppingsec',"
-                               ewarn "you have to make /usr/sbin/fping setuid 
root and executable"
-                               ewarn "by everyone. Run the following command 
to fix it:"
-                               ewarn
-                               ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-                               ewarn
-                               ewarn "Please be aware that this might impose a 
security risk,"
-                               ewarn "depending on the code quality of fping."
-                               ewarn
-                               ;;
-               esac
-       fi
-}

Reply via email to