commit:     612962bcfc33d9c829bc4246e76357791090428e
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 28 05:28:27 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Aug 28 05:28:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=612962bc

net-analyzer/zabbix: dropped obsolete 4.0.42, 5.0.25, 6.0.6-r1 & 6.2.0-r1

Bug: https://bugs.gentoo.org/866887
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 net-analyzer/zabbix/Manifest               |   7 -
 net-analyzer/zabbix/zabbix-4.0.42.ebuild   | 367 --------------------------
 net-analyzer/zabbix/zabbix-5.0.25.ebuild   | 398 ----------------------------
 net-analyzer/zabbix/zabbix-6.0.6-r1.ebuild | 411 -----------------------------
 net-analyzer/zabbix/zabbix-6.2.0-r1.ebuild | 411 -----------------------------
 5 files changed, 1594 deletions(-)

diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 49df58997667..be731de361d9 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -1,14 +1,7 @@
-DIST zabbix-4.0.42.tar.gz 17644927 BLAKE2B 
1cc80aafa2a8a556c14e5675a550307b532c01433eb3892889964b9de90e1bd05456c20da6854f149e297c88ffc7f8e165ff593652759e00836418482458f014
 SHA512 
80993c0cc2b0235407f3b11089a1700e90db892a732194297d893caf951f360cd4777a7e2146fed8e314b71f170c49ed2c4c271e3c3e888e55998bbf7308f0c7
 DIST zabbix-4.0.43.tar.gz 17648025 BLAKE2B 
1dbe0c8691d990278bcc540dcd57d7640a3d832021a9ec416dd67857a3e6e0724659ca13c6c59482e45e772cdb3c22f66810d0111e59d0371ed37f3d8b61275b
 SHA512 
5d7f81a2e7dd8d060ab46c37622b4b73702d208e065bd99022f6c7e9598f2230b89347e73864238861eed7747d5439221ed1e4cc7ac99bf1e990d9550612dd7f
-DIST zabbix-5.0.25-go-deps.tar.xz 34381664 BLAKE2B 
2da35cac59efe069587ad8217385cd276be340e9f0c37483c1a3aa500b03e0139122ca75437a1646fdb3d26ff7a824160d663cff758cf0a91fb08252606640ac
 SHA512 
625f0cdde87cff17bfb2e348a03ffab5374a5d7657c1510abeda5e0a313658625eda946474bc7b7bf7a778d8cf0b498215f9e26ee2c72c6456e87065071ec0ac
-DIST zabbix-5.0.25.tar.gz 21300141 BLAKE2B 
271d10a051b08d5d172d312b48a077e600856cef954201b0c11b1b4e96c70681ebe82e382893689199f6567922ed2e08b3bb534b77ccf1eed099049ccf45002e
 SHA512 
b66776f2ceaaef7c3b74cb47b99d96dcdb614cdae2f54d096046c2aeeb82c8c9c65ca17c95773551bfa867113ca36b29acb72a9102f0ccef930c16f0a4997774
 DIST zabbix-5.0.26-go-deps.tar.xz 34385532 BLAKE2B 
a52924f8bee464deb6f6812242c0d7d987e7b46d097f0a118e2cb429d6d3d26f8e116d66e594a26e22bc5bf81997d21fb66ef97151538a814f63fe2c55a7f729
 SHA512 
49727ccd5e26d28e577fe9ee1d7eaa2de3d5054e831ea82e5dc9d8177c63063cf957b575072c5dc68b294763d519fff9041700e2dc267394e6ec143d272b1dd7
 DIST zabbix-5.0.26.tar.gz 21248951 BLAKE2B 
9119e66acc71f5ed8baf07b6bc90a69152188e1e74058146a9c7eef7d36fc9f0363a5635518bdb696b76fb93c9777878b8d4411853c641dec809e86cba4cfa74
 SHA512 
b10b3eb849ea3646aeaf3d2a1dbf639e6effbd21a23c06e4f2686a177d2ae186537607ed0a76c3f520cb84f3bba3079f5d9f7e840077cf5e1a3eac4b46f0558b
-DIST zabbix-6.0.6-go-deps.tar.xz 35349508 BLAKE2B 
14aa70142d19d1ad146d5fab6208b1133a35796a67c6dd709df2fa7a00b013229ff852e58384ca01ed3c5feeb7f697da91d7096839e2434f3b5fe89b6f315cbb
 SHA512 
5864e268e7432cd04f389c4e6be6c871f0de402ccc0c846900daa1d77389e2839bbe1d225fcf2ac50d6052014e1efe3c8da8b02d83f46a411210edde39ed372c
-DIST zabbix-6.0.6.tar.gz 34013189 BLAKE2B 
f9d07ca8938ae4e5e47048c32872644caeda0ecdef17513c63c63d1ce2aaa4ac0c92e6c70932bc598ff908419dae05bab32924f5973a5528b5668f7c7c2c5a17
 SHA512 
4fc21f54cdfc09b5627a8e8dbe77ac645be7f3d3a0f18fc940cf136d05410ade755c3b4869254a47e9e316dba2b5da6b709a20a023b9cd765ad16094efcded43
 DIST zabbix-6.0.7-go-deps.tar.xz 35327308 BLAKE2B 
eb95964650a58bd300218888e9207f3feb25e9e0c87ed459446d6494bc2388d21d501e73ea8e0a99e4feabbd6d6c12d18c11b096cc6dc1fb534acbe8b3b353ac
 SHA512 
eff9ec6c170279aa228b05a83c5f1bb8d793216189575180d05255faf6a6062c2ab6366ff4aa4e2cd092636a984e6658be47c404628d24dbee209111d28a516e
 DIST zabbix-6.0.7.tar.gz 34190093 BLAKE2B 
781edbeaf5452f8e54b6fe91b77ad9dfc8ffcf4716e97f39f5ff8160f084d551cdee9bc34d67141ebcfc5eb0cb074a03c55e0dce36d06c6d589ee021c1c6dba6
 SHA512 
36e8e26edd104cfdd2510dd201b8020a41d7af3006ad04d6659083ebcc14574b3360c01f70c86a1e008f719c1078512c891ac525ffe7480816973b515f0dcc8f
-DIST zabbix-6.2.0-go-deps.tar.xz 35398044 BLAKE2B 
8f7a7ec5b806a22f2f1a6b652c7cb25af3fd503ac7e6ea16e2ab565716bf94f5dc4a290aaf17642bd9da937828ec984e582e876e871f8012eb44700c4ded1089
 SHA512 
4324b40c28b12b1032d76ff79da95220a47f3adea5f79e1d02ca85043234eaed91c33e309f5be49728054af19cf668df6b24f6fa4d715b67821e8c3a61eb62a8
-DIST zabbix-6.2.0.tar.gz 34472773 BLAKE2B 
2b90937f453825ba240d776a279d9bb4958c15da6cbef68c4c62bf4312c7967d8b7e0b3561d022c663ba8b42545bfd5757241c4ef13cc53b78c8135306e71e70
 SHA512 
4492dbd7c7acb55827ee17e7eee579d1cfdcf5fd499505c6e24f50ea361641a0813672149a87f076b2287896d56d8d0215d8c5e78b32b684386414024624d322
 DIST zabbix-6.2.1-go-deps.tar.xz 35335980 BLAKE2B 
07af6563a9349aa70bf5c258c949ebea520e191088e41e546e0f0cf139fd8f3d47d1d64c6135ed36851269fd0e5cd7b7e52d0d25ccd6fd1ed0108f60daf7cde0
 SHA512 
146a3a4dc2d49b4d1f48f2f3e38f1d123860d4854c5b4a696c07649141cf6de4b076751cb99582688518b060100a0b740357921177b5340ea4b9426480051360
 DIST zabbix-6.2.1.tar.gz 34776549 BLAKE2B 
4952f81936e999c03b8aa71cc370ddc7fcea7f3951bc403501c3617748ecd81a10c5bfe9f80ff55a2521e6b874c50463aa61151ea30ddd6a7b46b20b5e24b645
 SHA512 
cfdca2a34fecd31ff6f58257abc695e9aba3eaeefebd66f8653b5999e3b650e5ba94d036fc5b9d8e03a1cf532d5f76b1d36a3a9759831707d88ebbe37dc20fc5

diff --git a/net-analyzer/zabbix/zabbix-4.0.42.ebuild 
b/net-analyzer/zabbix/zabbix-4.0.42.ebuild
deleted file mode 100644
index b6f830af64d9..000000000000
--- a/net-analyzer/zabbix/zabbix-4.0.42.ebuild
+++ /dev/null
@@ -1,367 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit webapp java-pkg-opt-2 systemd toolchain-funcs tmpfiles user-info
-
-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://cdn.zabbix.com/${PN}/sources/stable/4.0/${P}.tar.gz";
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
-IUSE="+agent curl frontend gnutls ipv6 java ldap libxml2 mbedtls mysql odbc 
openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static xmpp"
-REQUIRED_USE="|| ( agent frontend proxy server )
-       ?? ( gnutls mbedtls openssl )
-       proxy? ( ^^ ( mysql oracle postgres sqlite ) )
-       server? ( ^^ ( mysql oracle postgres ) !sqlite )
-       static? ( !oracle !snmp )"
-
-COMMON_DEPEND="
-       curl? ( net-misc/curl )
-       gnutls? ( net-libs/gnutls:0= )
-       java? ( >=virtual/jdk-1.8:* )
-       ldap? (
-               =dev-libs/cyrus-sasl-2*
-               net-libs/gnutls:=
-               net-nds/openldap:=
-       )
-       libxml2? ( dev-libs/libxml2 )
-       mbedtls? ( net-libs/mbedtls:0= )
-       mysql? ( dev-db/mysql-connector-c:= )
-       odbc? ( dev-db/unixODBC )
-       openipmi? ( sys-libs/openipmi )
-       openssl? ( dev-libs/openssl:=[-bindist(-)] )
-       oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
-       postgres? ( dev-db/postgresql:* )
-       proxy?  (
-               dev-libs/libevent:=
-               sys-libs/zlib
-       )
-       server? (
-               dev-libs/libevent:=
-               sys-libs/zlib
-       )
-       snmp? ( net-analyzer/net-snmp:= )
-       sqlite? ( dev-db/sqlite )
-       ssh? ( net-libs/libssh2 )
-       xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${COMMON_DEPEND}
-       acct-group/zabbix
-       acct-user/zabbix
-       java? ( >=virtual/jre-1.8:* )
-       mysql? ( virtual/mysql )
-       proxy? (
-               dev-libs/libpcre
-               net-analyzer/fping[suid]
-       )
-       server? (
-               app-admin/webapp-config
-               dev-libs/libpcre
-               net-analyzer/fping[suid]
-       )
-       frontend? (
-               app-admin/webapp-config
-               
dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-               media-libs/gd[png]
-               virtual/httpd-php:*
-               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] )
-       )
-"
-DEPEND="${COMMON_DEPEND}
-       static? (
-               curl? ( net-misc/curl[static-libs] )
-               ldap? (
-                       =dev-libs/cyrus-sasl-2*[static-libs]
-                       net-libs/gnutls[static-libs]
-                       net-nds/openldap[static-libs]
-               )
-               libxml2? ( dev-libs/libxml2[static-libs] )
-               mysql? ( dev-db/mysql-connector-c[static-libs] )
-               odbc? ( dev-db/unixODBC[static-libs] )
-               postgres? ( dev-db/postgresql:*[static-libs] )
-               sqlite? ( dev-db/sqlite[static-libs] )
-               ssh? ( net-libs/libssh2 )
-       )
-"
-BDEPEND="
-       virtual/pkgconfig
-"
-
-PATCHES=(
-       "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-       "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-)
-
-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
-       fi
-
-       if use frontend; then
-               webapp_pkg_setup
-       fi
-
-       java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-       default
-}
-
-src_configure() {
-       econf \
-               $(use_enable agent) \
-               $(use_enable ipv6) \
-               $(use_enable java) \
-               $(use_enable proxy) \
-               $(use_enable server) \
-               $(use_enable static) \
-               $(use_with curl libcurl) \
-               $(use_with gnutls) \
-               $(use_with ldap) \
-               $(use_with libxml2) \
-               $(use_with mbedtls) \
-               $(use_with mysql) \
-               $(use_with odbc unixodbc) \
-               $(use_with openipmi openipmi) \
-               $(use_with openssl) \
-               $(use_with oracle) \
-               $(use_with postgres postgresql) \
-               $(use_with snmp net-snmp) \
-               $(use_with sqlite sqlite3) \
-               $(use_with ssh ssh2) \
-               $(use_with xmpp jabber)
-}
-
-src_compile() {
-       if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-               emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-       fi
-}
-
-src_install() {
-       local dirs=(
-               /etc/zabbix
-               /var/lib/zabbix
-               /var/lib/zabbix/home
-               /var/lib/zabbix/scripts
-               /var/lib/zabbix/alertscripts
-               /var/lib/zabbix/externalscripts
-               /var/log/zabbix
-       )
-
-       for dir in "${dirs[@]}"; do
-               dodir "${dir}"
-               keepdir "${dir}"
-       done
-
-       if use server; then
-               insinto /etc/zabbix
-               doins "${S}"/conf/zabbix_server.conf
-               fperms 0640 /etc/zabbix/zabbix_server.conf
-               fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-               newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
-
-               dosbin src/zabbix_server/zabbix_server
-
-               insinto /usr/share/zabbix
-               doins -r "${S}"/database/
-
-               systemd_dounit "${FILESDIR}"/zabbix-server.service
-               newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles 
zabbix-server.conf
-       fi
-
-       if use proxy; then
-               insinto /etc/zabbix
-               doins "${S}"/conf/zabbix_proxy.conf
-               fperms 0640 /etc/zabbix/zabbix_proxy.conf
-               fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-               newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-               dosbin src/zabbix_proxy/zabbix_proxy
-
-               insinto /usr/share/zabbix
-               doins -r "${S}"/database/
-
-               systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-               newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles 
zabbix-proxy.conf
-       fi
-
-       if use agent; then
-               insinto /etc/zabbix
-               doins "${S}"/conf/zabbix_agentd.conf
-               fperms 0640 /etc/zabbix/zabbix_agentd.conf
-               fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-               newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-               dosbin src/zabbix_agent/zabbix_agentd
-               dobin \
-                       src/zabbix_sender/zabbix_sender \
-                       src/zabbix_get/zabbix_get
-
-               systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-               newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles 
zabbix-agentd.conf
-       fi
-
-       fowners root:zabbix /etc/zabbix
-       fowners zabbix: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-1.2.9.jar \
-                       src/zabbix_java/lib/logback-console.xml \
-                       src/zabbix_java/lib/logback-core-1.2.9.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.7.32.jar
-               newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-               newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf 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
-               tmpfiles_process zabbix-server.conf
-
-               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
-
-       if use proxy; then
-               tmpfiles_process zabbix-proxy.conf
-       fi
-
-       if use agent; then
-               tmpfiles_process zabbix-agentd.conf
-       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
-}
-
-pkg_prerm() {
-       (use frontend || use server) && webapp_pkg_prerm
-}

diff --git a/net-analyzer/zabbix/zabbix-5.0.25.ebuild 
b/net-analyzer/zabbix/zabbix-5.0.25.ebuild
deleted file mode 100644
index 901c486faa9c..000000000000
--- a/net-analyzer/zabbix/zabbix-5.0.25.ebuild
+++ /dev/null
@@ -1,398 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# To create the go modules tarball:
-#   cd src/go
-#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
-#   tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
-
-EAPI=8
-
-GO_OPTIONAL="yes"
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module 
user-info
-
-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://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
-       agent2? ( 
https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
-"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
-IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc 
openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
-REQUIRED_USE="|| ( agent agent2 frontend proxy server )
-       ?? ( gnutls openssl )
-       proxy? ( ^^ ( mysql oracle postgres sqlite ) )
-       server? ( ^^ ( mysql oracle postgres ) !sqlite )
-       static? ( !oracle !snmp )"
-
-COMMON_DEPEND="
-       curl? ( net-misc/curl )
-       gnutls? ( net-libs/gnutls:0= )
-       java? ( >=virtual/jdk-1.8:* )
-       ldap? (
-               =dev-libs/cyrus-sasl-2*
-               net-libs/gnutls:=
-               net-nds/openldap:=
-       )
-       libxml2? ( dev-libs/libxml2 )
-       mysql? ( dev-db/mysql-connector-c:= )
-       odbc? ( dev-db/unixODBC )
-       openipmi? ( sys-libs/openipmi )
-       openssl? ( dev-libs/openssl:=[-bindist(-)] )
-       oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
-       postgres? ( dev-db/postgresql:* )
-       proxy?  (
-               dev-libs/libevent:=
-               sys-libs/zlib
-       )
-       server? (
-               dev-libs/libevent:=
-               sys-libs/zlib
-       )
-       snmp? ( net-analyzer/net-snmp:= )
-       sqlite? ( dev-db/sqlite )
-       ssh? ( net-libs/libssh2 )
-"
-
-RDEPEND="${COMMON_DEPEND}
-       acct-group/zabbix
-       acct-user/zabbix
-       java? ( >=virtual/jre-1.8:* )
-       mysql? ( virtual/mysql )
-       proxy? (
-               dev-libs/libpcre
-               net-analyzer/fping[suid]
-       )
-       server? (
-               app-admin/webapp-config
-               dev-libs/libpcre
-               net-analyzer/fping[suid]
-       )
-       frontend? (
-               app-admin/webapp-config
-               
dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-               media-libs/gd[png]
-               virtual/httpd-php:*
-               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] )
-       )
-"
-DEPEND="${COMMON_DEPEND}
-       static? (
-               curl? ( net-misc/curl[static-libs] )
-               ldap? (
-                       =dev-libs/cyrus-sasl-2*[static-libs]
-                       net-libs/gnutls[static-libs]
-                       net-nds/openldap[static-libs]
-               )
-               libxml2? ( dev-libs/libxml2[static-libs] )
-               mysql? ( dev-db/mysql-connector-c[static-libs] )
-               odbc? ( dev-db/unixODBC[static-libs] )
-               postgres? ( dev-db/postgresql:*[static-libs] )
-               sqlite? ( dev-db/sqlite[static-libs] )
-               ssh? ( net-libs/libssh2 )
-       )
-"
-BDEPEND="
-       virtual/pkgconfig
-       agent2? (
-               >=dev-lang/go-1.12
-               app-arch/unzip
-       )
-"
-
-# upstream tests fail for agent2
-RESTRICT="test"
-
-PATCHES=(
-       "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-       "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-       "${FILESDIR}/${PN}-5.0.22-system.sw.packages.patch"
-)
-
-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
-       fi
-
-       if use frontend; then
-               webapp_pkg_setup
-       fi
-
-       java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-       default
-}
-
-src_configure() {
-       econf \
-               $(use_enable agent) \
-               $(use_enable agent2) \
-               $(use_enable ipv6) \
-               $(use_enable java) \
-               $(use_enable proxy) \
-               $(use_enable server) \
-               $(use_enable static) \
-               $(use_with curl libcurl) \
-               $(use_with gnutls) \
-               $(use_with ldap) \
-               $(use_with libxml2) \
-               $(use_with mysql) \
-               $(use_with odbc unixodbc) \
-               $(use_with openipmi openipmi) \
-               $(use_with openssl) \
-               $(use_with oracle) \
-               $(use_with postgres postgresql) \
-               $(use_with snmp net-snmp) \
-               $(use_with sqlite sqlite3) \
-               $(use_with ssh ssh2)
-}
-
-src_compile() {
-       if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-               emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-       fi
-}
-
-src_install() {
-       local dirs=(
-               /etc/zabbix
-               /var/lib/zabbix
-               /var/lib/zabbix/home
-               /var/lib/zabbix/scripts
-               /var/lib/zabbix/alertscripts
-               /var/lib/zabbix/externalscripts
-               /var/log/zabbix
-       )
-
-       for dir in "${dirs[@]}"; do
-               dodir "${dir}"
-               keepdir "${dir}"
-       done
-
-       if use server; then
-               insinto /etc/zabbix
-               doins "${S}"/conf/zabbix_server.conf
-               fperms 0640 /etc/zabbix/zabbix_server.conf
-               fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-               newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
-
-               dosbin src/zabbix_server/zabbix_server
-
-               insinto /usr/share/zabbix
-               doins -r "${S}"/database/
-
-               systemd_dounit "${FILESDIR}"/zabbix-server.service
-               newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles 
zabbix-server.conf
-       fi
-
-       if use proxy; then
-               insinto /etc/zabbix
-               doins "${S}"/conf/zabbix_proxy.conf
-               fperms 0640 /etc/zabbix/zabbix_proxy.conf
-               fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-               newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-               dosbin src/zabbix_proxy/zabbix_proxy
-
-               insinto /usr/share/zabbix
-               doins -r "${S}"/database/
-
-               systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-               newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles 
zabbix-proxy.conf
-       fi
-
-       if use agent; then
-               insinto /etc/zabbix
-               doins "${S}"/conf/zabbix_agentd.conf
-               fperms 0640 /etc/zabbix/zabbix_agentd.conf
-               fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-               newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-               dosbin src/zabbix_agent/zabbix_agentd
-               dobin \
-                       src/zabbix_sender/zabbix_sender \
-                       src/zabbix_get/zabbix_get
-
-               systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-               newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles 
zabbix-agentd.conf
-       fi
-
-       if use agent2; then
-               insinto /etc/zabbix
-               doins "${S}"/src/go/conf/zabbix_agent2.conf
-               fperms 0640 /etc/zabbix/zabbix_agent2.conf
-               fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
-
-               newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
-
-               dosbin src/go/bin/zabbix_agent2
-
-               systemd_dounit "${FILESDIR}"/zabbix-agent2.service
-               newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles 
zabbix-agent2.conf
-       fi
-
-       fowners root:zabbix /etc/zabbix
-       fowners zabbix: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 ui/* "${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-1.2.9.jar \
-                       src/zabbix_java/lib/logback-console.xml \
-                       src/zabbix_java/lib/logback-core-1.2.9.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.7.32.jar
-               newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-               newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf 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."
-                       ewarn
-                       ewarn "To change the homedir use:"
-                       ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-                       ewarn
-               fi
-       fi
-
-       if use server; then
-               tmpfiles_process zabbix-server.conf
-
-               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
-
-       if use proxy; then
-               tmpfiles_process zabbix-proxy.conf
-       fi
-
-       if use agent; then
-               tmpfiles_process zabbix-agentd.conf
-       fi
-
-       if use agent2; then
-               tmpfiles_process zabbix-agent2.conf
-       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
-}
-
-pkg_prerm() {
-       (use frontend || use server) && webapp_pkg_prerm
-}

diff --git a/net-analyzer/zabbix/zabbix-6.0.6-r1.ebuild 
b/net-analyzer/zabbix/zabbix-6.0.6-r1.ebuild
deleted file mode 100644
index 0a0d755be321..000000000000
--- a/net-analyzer/zabbix/zabbix-6.0.6-r1.ebuild
+++ /dev/null
@@ -1,411 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# To create the go modules tarball:
-#   cd src/go
-#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
-#   tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
-
-EAPI=8
-
-GO_OPTIONAL="yes"
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module 
user-info
-
-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://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
-       agent2? ( 
https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
-"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
-IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc 
openipmi +openssl oracle +pcre2 +postgres proxy server snmp sqlite ssh static"
-REQUIRED_USE="|| ( agent agent2 frontend proxy server )
-       ?? ( gnutls openssl )
-       proxy? ( ^^ ( mysql oracle postgres sqlite ) )
-       server? ( ^^ ( mysql oracle postgres ) !sqlite )
-       static? ( !oracle !snmp )"
-
-COMMON_DEPEND="
-       curl? ( net-misc/curl )
-       gnutls? ( net-libs/gnutls:0= )
-       java? ( >=virtual/jdk-1.8:* )
-       ldap? (
-               =dev-libs/cyrus-sasl-2*
-               net-libs/gnutls:=
-               net-nds/openldap:=
-       )
-       libxml2? ( dev-libs/libxml2 )
-       mysql? ( dev-db/mysql-connector-c:= )
-       odbc? ( dev-db/unixODBC )
-       openipmi? ( sys-libs/openipmi )
-       openssl? ( dev-libs/openssl:=[-bindist(-)] )
-       oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
-       postgres? ( dev-db/postgresql:* )
-       proxy?  (
-               dev-libs/libevent:=
-               sys-libs/zlib
-       )
-       server? (
-               dev-libs/libevent:=
-               sys-libs/zlib
-       )
-       snmp? ( net-analyzer/net-snmp:= )
-       sqlite? ( dev-db/sqlite )
-       ssh? ( net-libs/libssh2 )
-"
-
-RDEPEND="${COMMON_DEPEND}
-       acct-group/zabbix
-       acct-user/zabbix
-       java? ( >=virtual/jre-1.8:* )
-       mysql? ( virtual/mysql )
-       proxy? (
-               !pcre2? ( dev-libs/libpcre )
-               pcre2? ( dev-libs/libpcre2:= )
-               net-analyzer/fping[suid]
-       )
-       server? (
-               app-admin/webapp-config
-               !pcre2? ( dev-libs/libpcre )
-               pcre2? ( dev-libs/libpcre2:= )
-               net-analyzer/fping[suid]
-       )
-       frontend? (
-               app-admin/webapp-config
-               
dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-               media-libs/gd[png]
-               virtual/httpd-php:*
-               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] )
-       )
-"
-DEPEND="${COMMON_DEPEND}
-       static? (
-               curl? ( net-misc/curl[static-libs] )
-               ldap? (
-                       =dev-libs/cyrus-sasl-2*[static-libs]
-                       net-libs/gnutls[static-libs]
-                       net-nds/openldap[static-libs]
-               )
-               libxml2? ( dev-libs/libxml2[static-libs] )
-               mysql? ( dev-db/mysql-connector-c[static-libs] )
-               odbc? ( dev-db/unixODBC[static-libs] )
-               postgres? ( dev-db/postgresql:*[static-libs] )
-               sqlite? ( dev-db/sqlite[static-libs] )
-               ssh? ( net-libs/libssh2 )
-       )
-"
-BDEPEND="
-       virtual/pkgconfig
-       agent2? (
-               >=dev-lang/go-1.12
-               app-arch/unzip
-       )
-"
-
-# upstream tests fail for agent2
-RESTRICT="test"
-
-PATCHES=(
-       "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-       "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-       "${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch"
-)
-
-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
-       fi
-
-       if use frontend; then
-               webapp_pkg_setup
-       fi
-
-       java-pkg-opt-2_pkg_setup
-}
-
-src_configure() {
-       local econf_args=(
-               "$(use_enable agent)"
-               "$(use_enable agent2)"
-               "$(use_enable ipv6)"
-               "$(use_enable java)"
-               "$(use_enable proxy)"
-               "$(use_enable server)"
-               "$(use_enable static)"
-               "$(use_with curl libcurl)"
-               "$(use_with gnutls)"
-               "$(use_with ldap)"
-               "$(use_with libxml2)"
-               "$(use_with mysql)"
-               "$(use_with odbc unixodbc)"
-               "$(use_with openipmi openipmi)"
-               "$(use_with openssl)"
-               "$(use_with oracle)"
-               "$(use_with postgres postgresql)"
-               "$(use_with snmp net-snmp)"
-               "$(use_with sqlite sqlite3)"
-               "$(use_with ssh ssh2)"
-       )
-
-       if use pcre2; then
-               econf_args+=( --with-libpcre2 )
-       else
-               # If pcre2 is not enabled, then use the old pcre library.
-               econf_args+=( --with-libpcre )
-       fi
-
-       econf ${econf_args[@]}
-}
-
-src_compile() {
-       if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-               emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-       fi
-}
-
-src_install() {
-       local dirs=(
-               /etc/zabbix
-               /var/lib/zabbix
-               /var/lib/zabbix/home
-               /var/lib/zabbix/scripts
-               /var/lib/zabbix/alertscripts
-               /var/lib/zabbix/externalscripts
-               /var/log/zabbix
-       )
-
-       for dir in "${dirs[@]}"; do
-               keepdir "${dir}"
-       done
-
-       if use server; then
-               insinto /etc/zabbix
-               doins "${S}"/conf/zabbix_server.conf
-               fperms 0640 /etc/zabbix/zabbix_server.conf
-               fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-               newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
-
-               dosbin src/zabbix_server/zabbix_server
-
-               insinto /usr/share/zabbix
-               doins -r "${S}"/database/
-
-               systemd_dounit "${FILESDIR}"/zabbix-server.service
-               newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles 
zabbix-server.conf
-       fi
-
-       if use proxy; then
-               insinto /etc/zabbix
-               doins "${S}"/conf/zabbix_proxy.conf
-               fperms 0640 /etc/zabbix/zabbix_proxy.conf
-               fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-               newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-               dosbin src/zabbix_proxy/zabbix_proxy
-
-               insinto /usr/share/zabbix
-               doins -r "${S}"/database/
-
-               systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-               newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles 
zabbix-proxy.conf
-       fi
-
-       if use agent; then
-               insinto /etc/zabbix
-               doins "${S}"/conf/zabbix_agentd.conf
-               fperms 0640 /etc/zabbix/zabbix_agentd.conf
-               fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-               newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-               dosbin src/zabbix_agent/zabbix_agentd
-               dobin \
-                       src/zabbix_sender/zabbix_sender \
-                       src/zabbix_get/zabbix_get
-
-               systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-               newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles 
zabbix-agentd.conf
-       fi
-       if use agent2; then
-               insinto /etc/zabbix
-               doins "${S}"/src/go/conf/zabbix_agent2.conf
-               fperms 0640 /etc/zabbix/zabbix_agent2.conf
-               fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
-               keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
-
-               newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
-
-               dosbin src/go/bin/zabbix_agent2
-
-               systemd_dounit "${FILESDIR}"/zabbix-agent2.service
-               newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles 
zabbix-agent2.conf
-       fi
-
-       fowners root:zabbix /etc/zabbix
-       fowners zabbix: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 ui/* "${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-1.2.9.jar \
-                       src/zabbix_java/lib/logback-console.xml \
-                       src/zabbix_java/lib/logback-core-1.2.9.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.7.32.jar
-               newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-               newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf 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."
-                       ewarn
-                       ewarn "To change the homedir use:"
-                       ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-                       ewarn
-               fi
-       fi
-
-       if use server; then
-               tmpfiles_process zabbix-server.conf
-
-               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
-
-               if ! use pcre2; then
-                       ewarn "You are using zabbix with dev-libs/libpcre which 
is deprecated."
-                       ewarn "Consider switching to dev-libs/libpcre2 
(USE=pcre2) as soon as possible."
-                       ewarn "See 
https://www.zabbix.com/documentation/6.0/en/manual/installation/upgrade_notes_600#pcre2-support";
-               fi
-       fi
-
-       if use proxy; then
-               tmpfiles_process zabbix-proxy.conf
-       fi
-
-       if use agent; then
-               tmpfiles_process zabbix-agentd.conf
-       fi
-
-       if use agent2; then
-               tmpfiles_process zabbix-agent2.conf
-       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
-}
-
-pkg_prerm() {
-       (use frontend || use server) && webapp_pkg_prerm
-}

diff --git a/net-analyzer/zabbix/zabbix-6.2.0-r1.ebuild 
b/net-analyzer/zabbix/zabbix-6.2.0-r1.ebuild
deleted file mode 100644
index 0a0d755be321..000000000000
--- a/net-analyzer/zabbix/zabbix-6.2.0-r1.ebuild
+++ /dev/null
@@ -1,411 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# To create the go modules tarball:
-#   cd src/go
-#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
-#   tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
-
-EAPI=8
-
-GO_OPTIONAL="yes"
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module 
user-info
-
-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://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
-       agent2? ( 
https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
-"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
-IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc 
openipmi +openssl oracle +pcre2 +postgres proxy server snmp sqlite ssh static"
-REQUIRED_USE="|| ( agent agent2 frontend proxy server )
-       ?? ( gnutls openssl )
-       proxy? ( ^^ ( mysql oracle postgres sqlite ) )
-       server? ( ^^ ( mysql oracle postgres ) !sqlite )
-       static? ( !oracle !snmp )"
-
-COMMON_DEPEND="
-       curl? ( net-misc/curl )
-       gnutls? ( net-libs/gnutls:0= )
-       java? ( >=virtual/jdk-1.8:* )
-       ldap? (
-               =dev-libs/cyrus-sasl-2*
-               net-libs/gnutls:=
-               net-nds/openldap:=
-       )
-       libxml2? ( dev-libs/libxml2 )
-       mysql? ( dev-db/mysql-connector-c:= )
-       odbc? ( dev-db/unixODBC )
-       openipmi? ( sys-libs/openipmi )
-       openssl? ( dev-libs/openssl:=[-bindist(-)] )
-       oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
-       postgres? ( dev-db/postgresql:* )
-       proxy?  (
-               dev-libs/libevent:=
-               sys-libs/zlib
-       )
-       server? (
-               dev-libs/libevent:=
-               sys-libs/zlib
-       )
-       snmp? ( net-analyzer/net-snmp:= )
-       sqlite? ( dev-db/sqlite )
-       ssh? ( net-libs/libssh2 )
-"
-
-RDEPEND="${COMMON_DEPEND}
-       acct-group/zabbix
-       acct-user/zabbix
-       java? ( >=virtual/jre-1.8:* )
-       mysql? ( virtual/mysql )
-       proxy? (
-               !pcre2? ( dev-libs/libpcre )
-               pcre2? ( dev-libs/libpcre2:= )
-               net-analyzer/fping[suid]
-       )
-       server? (
-               app-admin/webapp-config
-               !pcre2? ( dev-libs/libpcre )
-               pcre2? ( dev-libs/libpcre2:= )
-               net-analyzer/fping[suid]
-       )
-       frontend? (
-               app-admin/webapp-config
-               
dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-               media-libs/gd[png]
-               virtual/httpd-php:*
-               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] )
-       )
-"
-DEPEND="${COMMON_DEPEND}
-       static? (
-               curl? ( net-misc/curl[static-libs] )
-               ldap? (
-                       =dev-libs/cyrus-sasl-2*[static-libs]
-                       net-libs/gnutls[static-libs]
-                       net-nds/openldap[static-libs]
-               )
-               libxml2? ( dev-libs/libxml2[static-libs] )
-               mysql? ( dev-db/mysql-connector-c[static-libs] )
-               odbc? ( dev-db/unixODBC[static-libs] )
-               postgres? ( dev-db/postgresql:*[static-libs] )
-               sqlite? ( dev-db/sqlite[static-libs] )
-               ssh? ( net-libs/libssh2 )
-       )
-"
-BDEPEND="
-       virtual/pkgconfig
-       agent2? (
-               >=dev-lang/go-1.12
-               app-arch/unzip
-       )
-"
-
-# upstream tests fail for agent2
-RESTRICT="test"
-
-PATCHES=(
-       "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-       "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-       "${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch"
-)
-
-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
-       fi
-
-       if use frontend; then
-               webapp_pkg_setup
-       fi
-
-       java-pkg-opt-2_pkg_setup
-}
-
-src_configure() {
-       local econf_args=(
-               "$(use_enable agent)"
-               "$(use_enable agent2)"
-               "$(use_enable ipv6)"
-               "$(use_enable java)"
-               "$(use_enable proxy)"
-               "$(use_enable server)"
-               "$(use_enable static)"
-               "$(use_with curl libcurl)"
-               "$(use_with gnutls)"
-               "$(use_with ldap)"
-               "$(use_with libxml2)"
-               "$(use_with mysql)"
-               "$(use_with odbc unixodbc)"
-               "$(use_with openipmi openipmi)"
-               "$(use_with openssl)"
-               "$(use_with oracle)"
-               "$(use_with postgres postgresql)"
-               "$(use_with snmp net-snmp)"
-               "$(use_with sqlite sqlite3)"
-               "$(use_with ssh ssh2)"
-       )
-
-       if use pcre2; then
-               econf_args+=( --with-libpcre2 )
-       else
-               # If pcre2 is not enabled, then use the old pcre library.
-               econf_args+=( --with-libpcre )
-       fi
-
-       econf ${econf_args[@]}
-}
-
-src_compile() {
-       if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-               emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-       fi
-}
-
-src_install() {
-       local dirs=(
-               /etc/zabbix
-               /var/lib/zabbix
-               /var/lib/zabbix/home
-               /var/lib/zabbix/scripts
-               /var/lib/zabbix/alertscripts
-               /var/lib/zabbix/externalscripts
-               /var/log/zabbix
-       )
-
-       for dir in "${dirs[@]}"; do
-               keepdir "${dir}"
-       done
-
-       if use server; then
-               insinto /etc/zabbix
-               doins "${S}"/conf/zabbix_server.conf
-               fperms 0640 /etc/zabbix/zabbix_server.conf
-               fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-               newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
-
-               dosbin src/zabbix_server/zabbix_server
-
-               insinto /usr/share/zabbix
-               doins -r "${S}"/database/
-
-               systemd_dounit "${FILESDIR}"/zabbix-server.service
-               newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles 
zabbix-server.conf
-       fi
-
-       if use proxy; then
-               insinto /etc/zabbix
-               doins "${S}"/conf/zabbix_proxy.conf
-               fperms 0640 /etc/zabbix/zabbix_proxy.conf
-               fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-               newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-               dosbin src/zabbix_proxy/zabbix_proxy
-
-               insinto /usr/share/zabbix
-               doins -r "${S}"/database/
-
-               systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-               newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles 
zabbix-proxy.conf
-       fi
-
-       if use agent; then
-               insinto /etc/zabbix
-               doins "${S}"/conf/zabbix_agentd.conf
-               fperms 0640 /etc/zabbix/zabbix_agentd.conf
-               fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-               newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-               dosbin src/zabbix_agent/zabbix_agentd
-               dobin \
-                       src/zabbix_sender/zabbix_sender \
-                       src/zabbix_get/zabbix_get
-
-               systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-               newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles 
zabbix-agentd.conf
-       fi
-       if use agent2; then
-               insinto /etc/zabbix
-               doins "${S}"/src/go/conf/zabbix_agent2.conf
-               fperms 0640 /etc/zabbix/zabbix_agent2.conf
-               fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
-               keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
-
-               newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
-
-               dosbin src/go/bin/zabbix_agent2
-
-               systemd_dounit "${FILESDIR}"/zabbix-agent2.service
-               newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles 
zabbix-agent2.conf
-       fi
-
-       fowners root:zabbix /etc/zabbix
-       fowners zabbix: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 ui/* "${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-1.2.9.jar \
-                       src/zabbix_java/lib/logback-console.xml \
-                       src/zabbix_java/lib/logback-core-1.2.9.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.7.32.jar
-               newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-               newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf 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."
-                       ewarn
-                       ewarn "To change the homedir use:"
-                       ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-                       ewarn
-               fi
-       fi
-
-       if use server; then
-               tmpfiles_process zabbix-server.conf
-
-               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
-
-               if ! use pcre2; then
-                       ewarn "You are using zabbix with dev-libs/libpcre which 
is deprecated."
-                       ewarn "Consider switching to dev-libs/libpcre2 
(USE=pcre2) as soon as possible."
-                       ewarn "See 
https://www.zabbix.com/documentation/6.0/en/manual/installation/upgrade_notes_600#pcre2-support";
-               fi
-       fi
-
-       if use proxy; then
-               tmpfiles_process zabbix-proxy.conf
-       fi
-
-       if use agent; then
-               tmpfiles_process zabbix-agentd.conf
-       fi
-
-       if use agent2; then
-               tmpfiles_process zabbix-agent2.conf
-       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
-}
-
-pkg_prerm() {
-       (use frontend || use server) && webapp_pkg_prerm
-}

Reply via email to