commit:     5d9d82757e9b0d50b25db129af0497c0a16d6f71
Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  2 16:30:40 2019 +0000
Commit:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Sun Jun  2 16:30:40 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d9d8275

net-analyzer/zabbix: Bump

Also remove some old 4.0 ebuilds

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

 net-analyzer/zabbix/Manifest                       |   4 +-
 net-analyzer/zabbix/zabbix-4.0.3.ebuild            | 333 ---------------------
 net-analyzer/zabbix/zabbix-4.0.4.ebuild            | 333 ---------------------
 .../{zabbix-4.0.5.ebuild => zabbix-4.0.7.ebuild}   |   0
 4 files changed, 1 insertion(+), 669 deletions(-)

diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index e1923a8840e..7aad59b1096 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -13,7 +13,5 @@ DIST zabbix-3.4.12.tar.gz 17509251 BLAKE2B 
158c7b3061059cc54a5988296404ed6670ca8
 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.3.tar.gz 18019170 BLAKE2B 
0b36ece98ec68ce48c7f38c167c81c4622e454f5626396fdea67092506bcea120c8cc8fd408e2dd4671db44a4c5c0760aa5aba78204d4ad7d124f7d3e62faf35
 SHA512 
ee8feec85a01c7617d3420529afa59550982c3c51173f8de484a8833099d33cccb84fa4e82f7199bc0ed8af687eb206ae50e4853b824bfbe784f67964cc15e37
-DIST zabbix-4.0.4.tar.gz 18045463 BLAKE2B 
b236bfc4c98aece3efa9af855055fffe8ddb032dc9dbc47564af120914c8cd373a258e1db890fa51581975628bd065fb7c41295d3291460b77575c9d1958cb37
 SHA512 
cf07c6dc3ea4b3722790d6db9219b81be7cb06cc11925a335b38bc3a7ad3fc395b45f6ba77edaf41eed545796ed2979c7b2f3b11b67fa6f39b76b58320642adb
-DIST zabbix-4.0.5.tar.gz 17098529 BLAKE2B 
0148f1087890a5321acf3cd9fdc45ae0f0bc6f8682645799df0e822f4b81e18625d95689b067300c28832c178e3863691dfb3b26ea747db64b0aeeb4e52326c5
 SHA512 
65794a37b1abd899af2709812a3ce2671e35a6bd9b4751097c6e373736f68ecb3af8c25d6c7f63c2cd8787fe9278e5d70f30d84133bf78d4c742fdf52560957d
 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-4.0.3.ebuild 
b/net-analyzer/zabbix/zabbix-4.0.3.ebuild
deleted file mode 100644
index 0ed8678d8d9..00000000000
--- a/net-analyzer/zabbix/zabbix-4.0.3.ebuild
+++ /dev/null
@@ -1,333 +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=""
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle 
+postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-       proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-       server? ( ^^ ( mysql oracle postgres odbc ) )
-       static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-       ldap? (
-               net-nds/openldap
-               =dev-libs/cyrus-sasl-2*
-               net-libs/gnutls
-       )
-       mysql? ( >=virtual/mysql-5.0.3 )
-       sqlite? ( >=dev-db/sqlite-3.3.5 )
-       postgres? ( >=dev-db/postgresql-8.1:* )
-       oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-       xmpp? ( dev-libs/iksemel )
-       libxml2? ( dev-libs/libxml2 )
-       curl? ( net-misc/curl )
-       openipmi? ( sys-libs/openipmi )
-       ssh? ( net-libs/libssh2 )
-       java? ( virtual/jdk:* )
-       odbc? ( dev-db/unixODBC )
-       server? ( sys-libs/zlib )
-       proxy?  ( sys-libs/zlib )
-       ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
-       proxy? ( net-analyzer/fping[suid] )
-       server? ( net-analyzer/fping[suid]
-               app-admin/webapp-config
-               dev-libs/libpcre
-               dev-libs/libevent )
-       java?   (
-               >=virtual/jre-1.4
-               dev-java/slf4j-api
-       )
-       frontend? (
-               
>=dev-lang/php-5.4.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-               || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-               mysql? ( dev-lang/php[mysqli] )
-               odbc? ( dev-lang/php[odbc] )
-               oracle? ( dev-lang/php[oci8-instant-client] )
-               postgres? ( dev-lang/php[postgres] )
-               sqlite? ( dev-lang/php[sqlite] )
-               media-libs/gd[png]
-               app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-       static? (
-               ldap? (
-                       net-nds/openldap[static-libs]
-                       =dev-libs/cyrus-sasl-2*[static-libs]
-                       net-libs/gnutls[static-libs]
-               )
-       mysql? ( >=virtual/mysql-5.0.3[static-libs] )
-       sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-       postgres? ( >=dev-db/postgresql-8.1:*[static-libs] )
-       libxml2? ( dev-libs/libxml2[static-libs] )
-       curl? ( net-misc/curl[static-libs] )
-       ssh? ( net-libs/libssh2[static-libs] )
-       odbc? ( dev-db/unixODBC[static-libs] )
-       )
-       virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-       if use oracle; then
-               if [ -z "${ORACLE_HOME}" ]; then
-                       eerror
-                       eerror "The environment variable ORACLE_HOME must be 
set"
-                       eerror "and point to the correct location."
-                       eerror "It looks like you don't have Oracle installed."
-                       eerror
-                       die "Environment variable ORACLE_HOME is not set"
-               fi
-               if has_version 'dev-db/oracle-instantclient-basic'; then
-                       ewarn
-                       ewarn "Please ensure you have a full install of the 
Oracle client."
-                       ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-                       ewarn
-               fi
-       fi
-
-       if use frontend; then
-               webapp_pkg_setup
-       fi
-
-       enewgroup zabbix
-       enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-       cd "${S}/src/zabbix_java/lib"
-       rm -v *.jar || die
-
-       java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-       eapply -p1 "${FILESDIR}/4.0/patches/zbx401-modulepathfix.patch"
-       eapply_user
-}
-
-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-4.0.4.ebuild 
b/net-analyzer/zabbix/zabbix-4.0.4.ebuild
deleted file mode 100644
index 6f3e1a57879..00000000000
--- a/net-analyzer/zabbix/zabbix-4.0.4.ebuild
+++ /dev/null
@@ -1,333 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network 
and servers"
-HOMEPAGE="https://www.zabbix.com/";
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz";
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS=""
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle 
+postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-       proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-       server? ( ^^ ( mysql oracle postgres odbc ) )
-       static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-       ldap? (
-               net-nds/openldap
-               =dev-libs/cyrus-sasl-2*
-               net-libs/gnutls
-       )
-       mysql? ( >=virtual/mysql-5.0.3 )
-       sqlite? ( >=dev-db/sqlite-3.3.5 )
-       postgres? ( >=dev-db/postgresql-8.1:* )
-       oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-       xmpp? ( dev-libs/iksemel )
-       libxml2? ( dev-libs/libxml2 )
-       curl? ( net-misc/curl )
-       openipmi? ( sys-libs/openipmi )
-       ssh? ( net-libs/libssh2 )
-       java? ( virtual/jdk:* )
-       odbc? ( dev-db/unixODBC )
-       server? ( sys-libs/zlib )
-       proxy?  ( sys-libs/zlib )
-       ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
-       proxy? ( net-analyzer/fping[suid] )
-       server? ( net-analyzer/fping[suid]
-               app-admin/webapp-config
-               dev-libs/libpcre
-               dev-libs/libevent )
-       java?   (
-               >=virtual/jre-1.4
-               dev-java/slf4j-api
-       )
-       frontend? (
-               
>=dev-lang/php-5.4.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-               || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-               mysql? ( dev-lang/php[mysqli] )
-               odbc? ( dev-lang/php[odbc] )
-               oracle? ( dev-lang/php[oci8-instant-client] )
-               postgres? ( dev-lang/php[postgres] )
-               sqlite? ( dev-lang/php[sqlite] )
-               media-libs/gd[png]
-               app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-       static? (
-               ldap? (
-                       net-nds/openldap[static-libs]
-                       =dev-libs/cyrus-sasl-2*[static-libs]
-                       net-libs/gnutls[static-libs]
-               )
-       mysql? ( >=virtual/mysql-5.0.3[static-libs] )
-       sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-       postgres? ( >=dev-db/postgresql-8.1:*[static-libs] )
-       libxml2? ( dev-libs/libxml2[static-libs] )
-       curl? ( net-misc/curl[static-libs] )
-       ssh? ( net-libs/libssh2[static-libs] )
-       odbc? ( dev-db/unixODBC[static-libs] )
-       )
-       virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-       if use oracle; then
-               if [ -z "${ORACLE_HOME}" ]; then
-                       eerror
-                       eerror "The environment variable ORACLE_HOME must be 
set"
-                       eerror "and point to the correct location."
-                       eerror "It looks like you don't have Oracle installed."
-                       eerror
-                       die "Environment variable ORACLE_HOME is not set"
-               fi
-               if has_version 'dev-db/oracle-instantclient-basic'; then
-                       ewarn
-                       ewarn "Please ensure you have a full install of the 
Oracle client."
-                       ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-                       ewarn
-               fi
-       fi
-
-       if use frontend; then
-               webapp_pkg_setup
-       fi
-
-       enewgroup zabbix
-       enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-       cd "${S}/src/zabbix_java/lib"
-       rm -v *.jar || die
-
-       java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-       eapply -p1 "${FILESDIR}/4.0/patches/zbx401-modulepathfix.patch"
-       eapply_user
-}
-
-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-4.0.5.ebuild 
b/net-analyzer/zabbix/zabbix-4.0.7.ebuild
similarity index 100%
rename from net-analyzer/zabbix/zabbix-4.0.5.ebuild
rename to net-analyzer/zabbix/zabbix-4.0.7.ebuild

Reply via email to