commit:     3717919581fab87cbc6feace595d33be29e4ec2d
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 27 06:34:06 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Feb 27 06:34:06 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37179195

net-analyzer/zabbix: dropped obsolete ebuilds

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

 net-analyzer/zabbix/Manifest             |  10 -
 net-analyzer/zabbix/metadata.xml         |   1 -
 net-analyzer/zabbix/zabbix-5.0.29.ebuild | 398 ------------------------------
 net-analyzer/zabbix/zabbix-6.0.10.ebuild | 411 -------------------------------
 net-analyzer/zabbix/zabbix-6.0.11.ebuild | 397 -----------------------------
 net-analyzer/zabbix/zabbix-6.2.4.ebuild  | 411 -------------------------------
 net-analyzer/zabbix/zabbix-6.2.5.ebuild  | 397 -----------------------------
 7 files changed, 2025 deletions(-)

diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 0edca27187e1..83079ba83e3f 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -1,22 +1,12 @@
 DIST zabbix-4.0.44.tar.gz 17713321 BLAKE2B 
1f75f99430846cfc029d5e541ede7ef8c019a42af0ab6d70be3170052b723877ca54f6554cd9a29f7f436fb6e9d5ffd02913a1b12ad45a2a8ed00432738e5660
 SHA512 
223d6fdd352e5731487797d839c1741209eae79af78a058d3ba29e5a9eaab5cbf91072ad827bdd676696d3ea518c638d7fd515bff2a257aef3a7ad38f41b3cb6
-DIST zabbix-5.0.29-go-deps.tar.xz 34421032 BLAKE2B 
35809df9e2d9186813ec079d31206bccd8e4bf6da0376e1e87a65ccb17345bc3f8e81820cbad7700ab2596ede4fe604867337b89d74ac3254eeccacc128a4708
 SHA512 
6553612cc1b7a01cd6b43378f7a5e15fd99245ecc23d1345a0a780ba506073ac2b8b68e96599f56ea7a01052d74b14f6e2f29ca9a97d71748fe285583531f82d
-DIST zabbix-5.0.29.tar.gz 21471836 BLAKE2B 
e38f3b7c38900d80ca0497326f9979e793d04fd34d716673e76ea65723e0019caa7e1e92e581ac6423f77a2fff7554250c728721c125596b1c9a17b0c860346b
 SHA512 
60e707d79ee9f92b69aecabc97e92ad04d0d66839ceed250788f111db4128a66197b9c528bde8cb4f4f92e6a5502ff31c6d838e3c1d3b81ce6b7910879915b61
 DIST zabbix-5.0.30-go-deps.tar.xz 34398308 BLAKE2B 
f987ec0518a070d9480be7a57a8101f6c65f89ff0cdf513cb19b5d79e88c410782df87e732c7d838e6db6dd933cc855c027fc8351855121a57e0a2912ed0bda2
 SHA512 
eb1ad8c3983e475229887a2561f6e55ed3a4c1be270221fc12c0d0fcba7f2ad661f984f16f5f5d9684496c35c6daebd93dd13f5e898244af90d9ad9bffb911c6
 DIST zabbix-5.0.30.tar.gz 21505195 BLAKE2B 
e6876b896e61feccdcfa05a9bc2ae57345957e8e4dc2e2c3d635e917cc525c9cf4dad5e45821e6677f766654bd702b8baac8b65a4fc286af816fbf2b2e076a0c
 SHA512 
2f744fc1ba42ea0602cc90c91342f531c55cb1f76eda47c6e928e74dc595f7bd885f69abb52c6eb1b20e65bd6c3c46c299d6cfee2c3442db137561060386a31e
 DIST zabbix-5.0.31-go-deps.tar.xz 34443128 BLAKE2B 
38bf33002e6dbae95b39579383f8bb6998b0408434f140b1bb31e7cadf07a0363ac6234a820ec306cc12f764fc43d250a45ffd159a315dc494d0871ae6167660
 SHA512 
4d54ff09ccb356b3080240065598cc93d11a11c8faef0c6a22ec923face789cf2bee95ddaf62d0ecd74bd0807060fb4fcbcfa71b1ffcb8723096b1164d7c25ae
 DIST zabbix-5.0.31.tar.gz 21567566 BLAKE2B 
076090e07856df0dc2603d75fb7cc9862e40b9e6bda89094cf687aa00719a0df7cf7fd93bc973cb38cbbb31b6b723efd3dc5aa6dde00b4f4a5b118331795bfeb
 SHA512 
7409e23313a6c5f6f4f1e1c0ba0ccfec88aa2687caa25673709bf05b9e287a535ea417551dee0f9d2fbd571adfe843a700ee45ee3dc72752cdeab12ec4c54644
-DIST zabbix-6.0.10-go-deps.tar.xz 27482516 BLAKE2B 
64b9f2d093aaa8b7b1b39d4736f9b087fdcc518b1a5eced7a46bfe5a1ea2c1bc2d3641ab8e61d4fca8f036a8a96d8c8b56fe9dab17b356b8c5e507f77f10b864
 SHA512 
15b4799d8934155112469f4a571b8f015a0779b7c946a49cebb4b513ff7553989cd71704e403ae3fdf18646235fc40daf14bb9481d493ad8e6b53146fd7f3f27
-DIST zabbix-6.0.10.tar.gz 39516402 BLAKE2B 
00e81dcea63433cb93ef9bd77094bef89f7d604d8c07b9da5959c79d54f026b1256f486395229e0232aa96271b72fd9f3c67e08dfb96321be398b8b4fa832f6f
 SHA512 
4fc70d89f61f50e5a6b9bbd1a25d9cac6d734872d3558df83b01abe04832773cdbab6e0f214045c117b6e2fcd7ae3fba08701be942cf18344e6b5a78151665d6
-DIST zabbix-6.0.11-go-deps.tar.xz 27480580 BLAKE2B 
443ecbd9fd0d66cacc75f53d5f56ae996bce52e04827de97948ffc6a3e02888b4b5122eba2425465624e34bc628992f7a520bc8e0281444baed0aa1631f3bec1
 SHA512 
0936626b658f1811e8aebdd59ca506b33f1a95696018b088cfe04479386ecbcfe4c6c7fac6d26487e28d36cb6283028312c3bc2d27bde8cf54698236d3bc6ba4
-DIST zabbix-6.0.11.tar.gz 40388383 BLAKE2B 
e6ded007285aac58bb4c29075ac8d34f6ab0db1a74702269b63dc8772ebdf8b2986737fa91d39c9e8bacee5e1e12d7d7bb9580221f9b4917cbc829784639201d
 SHA512 
decb9fcf5de8f0d81cd0b16b6a5e341742c97baed0faf2d5f22bba98fd9fad4e154360724b5aedc378d5b5e2c64eda36f308e3eb6e6f8e80a5cf082ea95ebef6
 DIST zabbix-6.0.12-go-deps.tar.xz 27481268 BLAKE2B 
cfeca38b63a6271b4ff6819143e0214d3b468e3f7b681cc0bde443192e84ec4b66eb9b8ce38be01fa74a186f8904dfe73af04ad98007880e9ad6aab5c4b978b3
 SHA512 
c021efe15b61eeebad855ee9d8081f06796d126f3215bac4cb8a36384185aa2a67c0af580b5fcd830e6da832eb1057c02621c71569e30735fb0bef172f26d3b4
 DIST zabbix-6.0.12.tar.gz 40419443 BLAKE2B 
18e328a3361947292b3c78fc75dbcfc464f3419fb35bd0895049c90d26d362edbe0a727d1ab955f428ec812d6f38f68717f3c635216aff0468f188321b476495
 SHA512 
7cd254282523002d2e4d86295258ea0f56921b54c88d604300104f32ea5807c0b39b5550a9dd98e03ad41adf4dd8e93a7b1deb200d513283dca51d49d46bda4d
 DIST zabbix-6.0.13-go-deps.tar.xz 17974536 BLAKE2B 
296ae034ccf0f6cd1d83379c46ad87d80faf3d897d807d948312989e044dc4d159aabab27999730ed255be3c7d5aa6b70927bcfb888f9969b36994c68246c14b
 SHA512 
279aeed128e00dab8f1824ed7186ddc914615f7756a96c049bff0321997c9e412007c56701a036a1a25029aa7c4f878ad4566e95abbf766ee353666a6a588370
 DIST zabbix-6.0.13.tar.gz 41075557 BLAKE2B 
41db999c52d3ca596861d8850d594e639159b8c7090b47dd824be5b2695a6f1ebc0399643de8fb25af4081ab294c6fefe7ec9c0025ba4e4d17d44aa16d8b233a
 SHA512 
188622c0c04029eac376ebf60c96ed9d67923bc1f40eff75666a241bb534cb744aca8c51ff4b79d508dfadb9e758f80d9dc46016217bcb5a67e8ede7e645788e
-DIST zabbix-6.2.4-go-deps.tar.xz 27489292 BLAKE2B 
174c822aa1488fd2dfb726ed2cd5d2e86147404793ae97c6d45554de7cdf36073aa28a988e967798afb6681d1c054252433fcbae68816ccca79401383d4cc4e5
 SHA512 
6c1fa17663aaf91e234c34f7019b6f5b3720ab6c4300ece1ac5404f9f8499b74b6a2f5ab54e2eb0ac221d0df5e5e271762ff2f2f776e782bff0a3c85fe8f6407
-DIST zabbix-6.2.4.tar.gz 40299367 BLAKE2B 
ee74829acbac90a37bc3bcf3c95a92a7df1f83099cda7c9ba9ed225d3bdfa0e49667c5aa1522dbdac1ca2da8b621f94d384c857af8c66db87353f044f6ec0420
 SHA512 
16249f78f09e6c07a993972a7e72ef85083e08adfdcd6383b51a60ad172a48bdb4510a09dc82e8a36c5d748d3db155d3e4ca14909e2f2b4104bde200f151a596
-DIST zabbix-6.2.5-go-deps.tar.xz 27499244 BLAKE2B 
c8c7e59e0c2d61224bbfd11690a54b411a981e4ab3a39e217a03be83bdae04914898ab7b38c00d3a48900b769eabf51901410247a204915e0e901182c69266f3
 SHA512 
0c13f15b2ed62a6eb418244560cd40e277d333f17e65ceb9125335408fd632870d260f986b5c76328bc91e6b0b619816836c543f5d87ef5d957904aad722f613
-DIST zabbix-6.2.5.tar.gz 41020695 BLAKE2B 
5e21867358cc6c4374695b7da6d74b8c3642bf4e1f41ebcdb2a158c01e5a4b6ffd679728a35badeb3cbefe0968d97577e9141340b32287cb01d89e0f227b964a
 SHA512 
3cf5745942f69eee348c37ddb1bb68937c628ee97d050b0bfed37be66e4a30a6448829cbfa000f9388761e6611af9ae7046fdc63b608f3bcce1575bfa476dd5b
 DIST zabbix-6.2.6-go-deps.tar.xz 27486336 BLAKE2B 
e17aa599bc6be82e211f48642c03a73594965dd51a83b7e7e9ccbe949865034348a33cb413824d3d1aabd6aba56751132ef95dc333f75657bce3cc3fa4f1ef01
 SHA512 
eb18c6a78b0523543b7273c489d2dda94adb983df802b03020374b4bda51a44bf01e92bafe556242710f942474a9547a8366f724187f9a429e28bb94c0fa9c57
 DIST zabbix-6.2.6.tar.gz 41038757 BLAKE2B 
bc2dd394085d2bb32a052f682d7271b14967ca4100ada34a1145e0b137c32036202346a7ee7bed06f62ddf6a6c9b1033b9b1534aef50850a6d49446b40e6aa21
 SHA512 
03f2396fea0794f0a66a00880e7a46d0295a562fab2cfdd0890b2f9369bb1bfe6ee19398ab062bcdcdd9ef1415a6fa599a1f5e8135fb54ef6855e9f435619097
 DIST zabbix-6.2.7-go-deps.tar.xz 17973952 BLAKE2B 
f7e155040a60ac48236084b404d469bc5c34ab0dd986d3d647960bb6313f8080298f359680d6be23d2cb4c5f7d30bbab773c7fe81e4bde3873215f5e4072bed7
 SHA512 
e83dcd5cd6a07febf9c6380d311c84a319e3c45314266217837f6b35e540a6c9d4c980ceb7bb995ca8366247ea67d7d3c1b10beab677e4c24c69d83ba9977862

diff --git a/net-analyzer/zabbix/metadata.xml b/net-analyzer/zabbix/metadata.xml
index f1d56c470b2a..5a8b28dde8b8 100644
--- a/net-analyzer/zabbix/metadata.xml
+++ b/net-analyzer/zabbix/metadata.xml
@@ -26,7 +26,6 @@ configure different types of notifications for pre-defined 
events.
     <flag name="odbc">Enable Database Monitor and use UnixODBC Library by 
default</flag>
     <flag name="openipmi">Enable openipmi things</flag>
     <flag name="openssl">Use <pkg>dev-libs/openssl</pkg> as TLS backend</flag>
-    <flag name="pcre2">Use <pkg>dev-libs/libpcre2</pkg> instead of 
<pkg>dev-libs/libpcre</pkg></flag>
     <flag name="proxy">Enable proxy support</flag>
     <flag name="server">Enable zabbix server</flag>
     <flag name="ssh">SSH v2 based checks</flag>

diff --git a/net-analyzer/zabbix/zabbix-5.0.29.ebuild 
b/net-analyzer/zabbix/zabbix-5.0.29.ebuild
deleted file mode 100644
index 901c486faa9c..000000000000
--- a/net-analyzer/zabbix/zabbix-5.0.29.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.10.ebuild 
b/net-analyzer/zabbix/zabbix-6.0.10.ebuild
deleted file mode 100644
index 0a0d755be321..000000000000
--- a/net-analyzer/zabbix/zabbix-6.0.10.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.0.11.ebuild 
b/net-analyzer/zabbix/zabbix-6.0.11.ebuild
deleted file mode 100644
index 961445bff7c3..000000000000
--- a/net-analyzer/zabbix/zabbix-6.0.11.ebuild
+++ /dev/null
@@ -1,397 +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/libpcre2:=
-               net-analyzer/fping[suid]
-       )
-       server? (
-               app-admin/webapp-config
-               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=(
-               --with-libpcre2
-               "$(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)"
-       )
-
-       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
-       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.4.ebuild 
b/net-analyzer/zabbix/zabbix-6.2.4.ebuild
deleted file mode 100644
index 0a0d755be321..000000000000
--- a/net-analyzer/zabbix/zabbix-6.2.4.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.5.ebuild 
b/net-analyzer/zabbix/zabbix-6.2.5.ebuild
deleted file mode 100644
index 961445bff7c3..000000000000
--- a/net-analyzer/zabbix/zabbix-6.2.5.ebuild
+++ /dev/null
@@ -1,397 +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/libpcre2:=
-               net-analyzer/fping[suid]
-       )
-       server? (
-               app-admin/webapp-config
-               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=(
-               --with-libpcre2
-               "$(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)"
-       )
-
-       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
-       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