commit:     a4ebb74759d060d79cb27f845bb4fa8a6d3dff53
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  1 06:54:18 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Nov  1 06:54:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4ebb747

net-analyzer/zabbix: dropped obsolete 6.2.2, 6.0.8, 5.0.27 & 4.0.43

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

 net-analyzer/zabbix/Manifest             |   7 -
 net-analyzer/zabbix/zabbix-4.0.43.ebuild | 367 ---------------------------
 net-analyzer/zabbix/zabbix-5.0.27.ebuild | 398 ------------------------------
 net-analyzer/zabbix/zabbix-6.0.8.ebuild  | 411 -------------------------------
 net-analyzer/zabbix/zabbix-6.2.2.ebuild  | 411 -------------------------------
 5 files changed, 1594 deletions(-)

diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index e583ec89d1f0..4ddf8be2e101 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -1,14 +1,7 @@
-DIST zabbix-4.0.43.tar.gz 17648025 BLAKE2B 
1dbe0c8691d990278bcc540dcd57d7640a3d832021a9ec416dd67857a3e6e0724659ca13c6c59482e45e772cdb3c22f66810d0111e59d0371ed37f3d8b61275b
 SHA512 
5d7f81a2e7dd8d060ab46c37622b4b73702d208e065bd99022f6c7e9598f2230b89347e73864238861eed7747d5439221ed1e4cc7ac99bf1e990d9550612dd7f
 DIST zabbix-4.0.44.tar.gz 17713321 BLAKE2B 
1f75f99430846cfc029d5e541ede7ef8c019a42af0ab6d70be3170052b723877ca54f6554cd9a29f7f436fb6e9d5ffd02913a1b12ad45a2a8ed00432738e5660
 SHA512 
223d6fdd352e5731487797d839c1741209eae79af78a058d3ba29e5a9eaab5cbf91072ad827bdd676696d3ea518c638d7fd515bff2a257aef3a7ad38f41b3cb6
-DIST zabbix-5.0.27-go-deps.tar.xz 34405712 BLAKE2B 
a24aa4bfde3726e04a6eb2664e4e9ab510ebaee55bd35ee61fe296cd961482d587305f461ca76a483d5441c3a2a8554dbb510bb00aabf3d60a0cc7342f48f61b
 SHA512 
6f871b203247633253339db21015ad8610d905d9c7801ca34291af373fdc1a57b676b575da02b21968ab624fd3e87084cd4c4d234f43520d55a4a448c27d09e6
-DIST zabbix-5.0.27.tar.gz 21319138 BLAKE2B 
bd6d8986c3c1fbfb702fcda97ce1567701c4354cfed624978a3820b79643295e38c08370e43a2d2ae8b78f68118e4b443488903227197d3afd5fc298b806549e
 SHA512 
e6c3f63e0f3999d723c6e46611cbdb33eea2c81cf33821bf6204ea1e3c31a8745a65641da037886798f918e8f775d97c326dd180dc4b26d66cc0af822e8697ad
 DIST zabbix-5.0.28-go-deps.tar.xz 34382032 BLAKE2B 
09d5ba3e81bef941b09907d3bad752935a8106d9e0ea083d13b8946c68dab995180f3b8cc18ef0506f987a12672c3899392e54a5072be03cf4ffa19fbe11ee3d
 SHA512 
e22df02943569b4ef5dfbe043b137941194e0e44d059424d3ff59b34dfab1322dbbaf29586257f561328beec7f85f060c69866ed2723fe75f4bb45a21d2fbde1
 DIST zabbix-5.0.28.tar.gz 21453968 BLAKE2B 
aa4c94ee43d986897694a9a27cfd2a5cb2aa23678e8eeb1df9b7c7198d480a2543203dda6a81b316ed3a5c80d87ea51c8160f268525e3b7e96d2087f332c4f7e
 SHA512 
9f47205997bf2e7326dc7a7e04d352174dbc1c69fb1b34fdcbc10325ec0a3b70bf5c27373e6276e657f9a88a6d62f413e64612decf93eb53870471e53f2b6925
-DIST zabbix-6.0.8-go-deps.tar.xz 35354840 BLAKE2B 
bae764f1c66accc77171099c47432c8024c1e591286ac88cab7e25acb7c5f168ac69c5824d3e1e7281bfd2e26a1c80f5c77201368290424cc54fbb7134a76307
 SHA512 
f15d64e76c3ff037aa040fadd79805834b41c7494309c0d24f95c7d20c6c67c3d374f9079e2cc31a9af20a775d1691ef9cc57075cb895ee4e96f8b00cc41e2e6
-DIST zabbix-6.0.8.tar.gz 34291972 BLAKE2B 
9c3fc052c8da9e4d54462ed84ea5a7dc784b2b2256e8ca56083f2419319d6f79b4ff25a11b853214d0bd2a9f0f4b96d09bdbe1c5b311767d045e94070d80fedb
 SHA512 
76e3ec798b4cb4474ef6c0f936aea04cc9e15ce3aefb146e1de09b08c64559bdaa1caaa011fdfa94c23765417d8c3be3da9aa22dfb2cb403e588befa25fcc668
 DIST zabbix-6.0.9-go-deps.tar.xz 35300488 BLAKE2B 
7a516774f812e41a8640a68de11fb2f9e8e4d1da90d3c7a76807b25025ab32400e3c9efff7818ed90868da2d753c61e0f03126df0f7661cd440b1b59dc216217
 SHA512 
0f2c1e79b4b894384c9c09056242ccec732ffe49e80a6167748da4671e6f869486c1be70a83f09beaef356cfde4ec1b1a34ce2c5b122a0f19f351a82614d1389
 DIST zabbix-6.0.9.tar.gz 34515806 BLAKE2B 
c9b5a432ede5fc5307c30ee1c1f986cb1cb8f0351a46f9f0ee9add2c5d86a9b96ed933d2c6801022451cc8b52babc54deba8ba2478d90136a12798728f83366f
 SHA512 
20211e2eab47d03a5de221f3a466aaff24c01b868208d4cbd7a10a16a10cd20172f009842c631169962c06e13ca8b0c6f0b6bd3cfd060b68b59f95a136a2e207
-DIST zabbix-6.2.2-go-deps.tar.xz 35354668 BLAKE2B 
2fba7e9ee2c04f74d0fe041489136ac30e27ef5869799e0eef720baf0c1f3e4426fc43a8abbb5295b5dec7a5a3ddaf2399096858e47d2d594a23b726599994aa
 SHA512 
92d88ad0d398238cafc29a7d76b4105b8af690694a121aeb9068c5939231933ef9fb319287def02d6248dded6e6e4a6b77152be0bc3925327a4baa8974b1e76c
-DIST zabbix-6.2.2.tar.gz 34995538 BLAKE2B 
749e43f23e06f9ad84bea2bae82fc1b8a499df3b873d26fd4fbfefd28288a3f17c1f05207d143516787cb1417107dd8594c704ea79b1a3d745affc787e723ff9
 SHA512 
b9ea0fb8fbfba6ecba54ad3abb68b10a005098cbbdf7130c6f9321cabcfe60a3b3094214a84e1c9d18fc4a0c959cf238eea43b400af027b9f200fb99c088658a
 DIST zabbix-6.2.3-go-deps.tar.xz 35349056 BLAKE2B 
1548167558be12e7519e59e011eb6e761a0a5e1625fb460bbf3106ca5a895277789ce4b2f649884ebb0f236997771378ea47919f3e6fb6a4f4908a29ef34385e
 SHA512 
a8934a5bb2367395c1ba6bf7ccd830c951fb585e7dc054d29f2667bfc45d18eed13889f4c31f8f417aba1920df06512e927c77975f70ab419e7525768caece7f
 DIST zabbix-6.2.3.tar.gz 35252249 BLAKE2B 
fdc9bd32c1aa632b266d26d88cdc08ac40d2663823730298ae2a136730ad4646a38921b0425ac87ef2c4dad7c62f5d41c2955cdf6b275204e26306b115ae3568
 SHA512 
9a8d3021f0e2929897c2f6d3e05721a9dd55ec5778c39edf7af9fb99590f8eece6bba40cb085426373837409d690646254fd2a3f0b151224532226dc46df14f4

diff --git a/net-analyzer/zabbix/zabbix-4.0.43.ebuild 
b/net-analyzer/zabbix/zabbix-4.0.43.ebuild
deleted file mode 100644
index 8436fd2d7b37..000000000000
--- a/net-analyzer/zabbix/zabbix-4.0.43.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/$(ver_cut 
1-2)/${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.27.ebuild 
b/net-analyzer/zabbix/zabbix-5.0.27.ebuild
deleted file mode 100644
index 901c486faa9c..000000000000
--- a/net-analyzer/zabbix/zabbix-5.0.27.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.8.ebuild 
b/net-analyzer/zabbix/zabbix-6.0.8.ebuild
deleted file mode 100644
index 0a0d755be321..000000000000
--- a/net-analyzer/zabbix/zabbix-6.0.8.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.2.ebuild 
b/net-analyzer/zabbix/zabbix-6.2.2.ebuild
deleted file mode 100644
index 0a0d755be321..000000000000
--- a/net-analyzer/zabbix/zabbix-6.2.2.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