gentoo auto-resync : 26:01:2025 - 06:49:21

9 files changed, 135 insertions, 7 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 4d169a63c640..98809d4a4edb 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/fping/Manifest b/net-analyzer/fping/Manifest
index 3dbcdd513328..1795ee69a2f7 100644
--- a/net-analyzer/fping/Manifest
+++ b/net-analyzer/fping/Manifest
@@ -2,5 +2,5 @@ AUX fping-5.1-c99-musl.patch 1244 BLAKE2B 131b192dff128f58e3092e79f59258453baba7
 DIST fping-5.1.tar.gz 191224 BLAKE2B 2fb344e650b5a359fb8780f2c599455d39405ae823edf695ee4385aa2661dc5811e088bafa1b9f53846ee90c0afa959a92832381a03346d1fda048eb4e7ee098 SHA512 1a208da8dcd99093d0512af5d85ba5e7b5743ec97993d24c1fe612bb58d93090ac1ba0952f648aa075f16d390a77c4be65e394ae56dbede2a6914e0e8c68e2bd
 DIST fping-5.2.tar.gz 194259 BLAKE2B 7efb445f32ffe2d3766d598da5f1585270ae8e68ceb8b64e418040f330e7736bfaf0313077e28b12031af25ed7952943603d3a5908174c3f78d9a1af0b735da9 SHA512 062896662804c55ffe2d4e3eb7efc2ff796d20a77b367e16f8fa381e302986b5127ca55f0866bbf08f8ae2b2f6795ec4c5d43dc59ebec157fb3e8eff25d0bdb3
 EBUILD fping-5.1-r1.ebuild 677 BLAKE2B 0a010e21aea02854da3bd20416438662f39091a681e664de0d003de0a7b0f868d1fdf2e0ab67b4128684b748a4284efa3f51aa0d7ff8cbe9acaf0d6d83cbea4d SHA512 376b92bfcd296394663974d551cb03bd44d98fb90b36aedaff0f078895e59b2ae5c94abbc517afd8f8e10e375b6ee3478efd590e9e6438ad0c3a36a77df20660
-EBUILD fping-5.2.ebuild 881 BLAKE2B 880e91aefc26f9a72699d6793535306b4d2e13a8de9fb9c21240601385073903473625fcad639c51666ae655933105c36a834e2048db301abcc27525719147ee SHA512 4e49b56583079c98384d77720484a6a5b88bfa7c1b48517cef330f8d87b75aa96bccb0d041eb0a449cdeb03184334e468f9d7456b53d4fb352e877685210e21e
+EBUILD fping-5.2.ebuild 880 BLAKE2B 472df13fa460d29dc8cdc707f49d0bf9deeb95eecdcdd3350d8bea96983a3598a2264e1a87a3455f86626c2fae693ae65030745af1c278af9988c42b283f104d SHA512 7884216e63b078235639a73b47babf083d5bd856f046d54ccf884952f954bda6b50bb1f4e68f8dcb943d7420619a6fc79402221127b6e76ce52eae8e35fd50cd
 MISC metadata.xml 412 BLAKE2B cf9f74189166e68b3610dee763397a10855494947d30405ca374b52f22a634a052ffd486542d7147ad50bfadc66fb23ae20a654ff1f6ded2176085001e659bd6 SHA512 86a0ef3b8758b2ed892ca33a3a631ae6fb95d6414f4adaa952fbb44897a842df3873bdcd90729cfd71636f6643d9feb0855fb309a84eb9d8ad8324d03194fa5b
diff --git a/net-analyzer/fping/fping-5.2.ebuild b/net-analyzer/fping/fping-5.2.ebuild
index b225d8f0efb5..a3e1e13b8c7f 100644
--- a/net-analyzer/fping/fping-5.2.ebuild
+++ b/net-analyzer/fping/fping-5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="fping"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug suid"
 # There are some tests in ci/* but they don't seem to be for packaging
 # (they want to modify the live FS by e.g. copying to /tmp.)
diff --git a/net-analyzer/nethogs/Manifest b/net-analyzer/nethogs/Manifest
index bbaa723efbe9..49015ef95652 100644
--- a/net-analyzer/nethogs/Manifest
+++ b/net-analyzer/nethogs/Manifest
@@ -1,3 +1,6 @@
+AUX nethogs-0.8.8-meson.patch 2762 BLAKE2B 9fdd2d27084c6714d8cfe2b550013da3e2b05172e641920681edf71454298db5dc65edda803d5348725f4246c69a8fd995b49d1d4c5ea978d4195386a29996b3 SHA512 33790bc08dd53137f69bd00bc9cd916dc46a18cf8af0045c98a1a58bc1f7b5855d0a2a9ec95d42fada27a25ab0abb3a56f95e3442d2ecbe06c5169a1ff898b1b
 DIST nethogs-0.8.7.tar.gz 270631 BLAKE2B 179227d4b1fde5328e4885ce72bb28ac20482fa161afee7562546af5b403be1e851533e3861dfa2f514968aebe91a822e6b792520407853dfb1055c6d29ad121 SHA512 d965f3fa439ea9fbba83578b4272d03f396bf3cff9ae73a94936d47a3422d066d885c7f6f2a47fbe2f445a017bffa3fb3a1215976522ef0ad120fae3b95b31a2
+DIST nethogs-0.8.8.tar.gz 272792 BLAKE2B ec18cd291768c1baf22ab71b4219ab050c8f919419510234e71ec3d618fb0ff72cac4ccf04a4b1b063f71cf308f2ce2db09c595e4845372e4e6c61bf074e3ef3 SHA512 df076204c329f48161b01b51f89a6e7946b83ef330349e0df39e0358b9d3d973be9cdb64eb86ab9a83fb4f9389865a7859739de6a896374952ec2a08b2084b0d
 EBUILD nethogs-0.8.7.ebuild 781 BLAKE2B 5f8be1a90d7188a13b18f5ba63dcd2ff82609137d41cba3d752d99f63611d362ef444681a591a92bff176eacaf188271877fffe7457efc2bf59ba9b6f78651c0 SHA512 011ebf49925506bc3dc129ccf73195220e5448a8c19af8163b45509567136cdcabcb06bedf0f7377532fa5d08f421685a3e903c33d477d23277bf28319fc3b30
+EBUILD nethogs-0.8.8.ebuild 757 BLAKE2B cac05038f1600f4ec76b90eaab93d489b26fe8fc4bd21b526b76d8cca972297f9e681cd9c03138852e7fc156da9e3c2f6370c0ac5db3e6997a59d6d0141ffc17 SHA512 8dfbe1ed91b6ccd28642c9a25d96262f4758790f8a7ff56f23b8742577c9ad1ead193ce5bc6b2e5b33ad4813b4320019bfaa4618f2dce823a89f26136f341068
 MISC metadata.xml 899 BLAKE2B d1264983b4384b385a5480490544127e1a0676e69e1731b42355d19f627bf6b73588db11d8fbebc2ba42a7ba5c410c83af09323579d18819042d78d3afec54ad SHA512 c497cf9ef42e78b332330b20255d966d8b101286a611c3aa910768d08b368417a0014fa84eaae983c043165a714de59b768cb59dd36cd8bf686088709fdd6946
diff --git a/net-analyzer/nethogs/files/nethogs-0.8.8-meson.patch b/net-analyzer/nethogs/files/nethogs-0.8.8-meson.patch
new file mode 100644
index 000000000000..2c87197b9933
--- /dev/null
+++ b/net-analyzer/nethogs/files/nethogs-0.8.8-meson.patch
@@ -0,0 +1,85 @@
+https://github.com/raboof/nethogs/pull/285
+
+[Formatting patch 3/3 dropped.]
+
+From 049fff5623720fcd0b4fdc92501b586addbb6b48 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 25 Jan 2025 16:03:12 +0000
+Subject: [PATCH 1/3] meson: cleanup version detection
+
+Tell Meson what version the project is, so that we set the right versioning
+on libnethogs.
+---
+ meson.build | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 81d7b59..16e61b4 100644
+--- a/meson.build
++++ b/meson.build
+@@ -5,11 +5,11 @@
+ project('nethogs',
+         ['c', 'cpp'],
+         default_options : ['warning_level=3',
+-                           'cpp_std=c++14']
++                           'cpp_std=c++14'],
++        version : run_command('./determineVersion.sh').stdout().strip(),
+         )
+ 
+ cc = meson.get_compiler('cpp')
+-version = run_command('./determineVersion.sh', check: true).stdout().strip()
+ 
+ #######################################
+ ## Dependencies and flags definition ##
+@@ -19,7 +19,7 @@ projectinc = [include_directories('.', 'src')]
+ 
+ # flags
+ c_args = [
+-  '-DVERSION="' + version + '"'
++  '-DVERSION="' + meson.project_version() + '"'
+ ]
+ 
+ # dependencies
+@@ -42,5 +42,5 @@ pkgconfig = import('pkgconfig')
+ pkgconfig_install_dir = join_paths(get_option('libdir'), 'pkgconfig')
+ pkgconfig.generate(libnethogs,
+                    requires: ['libpcap'],
+-                   version: version
++                   version: meson.project_version()
+                    )
+
+From 5afce747f142f6df6a264ab368c99f47050d9984 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 25 Jan 2025 16:05:20 +0000
+Subject: [PATCH 2/3] meson: fix build with libnethogs disabled
+
+Fix `meson.build:43:19: ERROR: Unknown variable "libnethogs".`.
+
+While src/ has this correct, the top-level meson.build wasn't right.
+---
+ meson.build | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 16e61b4..8537718 100644
+--- a/meson.build
++++ b/meson.build
+@@ -38,9 +38,11 @@ subdir('src')
+ #############################
+ ## Pkgconfig definition    ##
+ #############################
+-pkgconfig = import('pkgconfig')
+-pkgconfig_install_dir = join_paths(get_option('libdir'), 'pkgconfig')
+-pkgconfig.generate(libnethogs,
+-                   requires: ['libpcap'],
+-                   version: meson.project_version()
+-                   )
++if get_option('enable-libnethogs').enabled()
++  pkgconfig = import('pkgconfig')
++  pkgconfig_install_dir = join_paths(get_option('libdir'), 'pkgconfig')
++  pkgconfig.generate(libnethogs,
++                     requires: ['libpcap'],
++                     version: meson.project_version()
++                     )
++endif
+
diff --git a/net-analyzer/nethogs/nethogs-0.8.8.ebuild b/net-analyzer/nethogs/nethogs-0.8.8.ebuild
new file mode 100644
index 000000000000..1d255bd12fc3
--- /dev/null
+++ b/net-analyzer/nethogs/nethogs-0.8.8.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fcaps meson
+
+DESCRIPTION="Small 'net top' tool, grouping bandwidth by process"
+HOMEPAGE="https://github.com/raboof/nethogs"
+SRC_URI="https://github.com/raboof/nethogs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	net-libs/libpcap
+	sys-libs/ncurses:=[cxx]
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( DESIGN README.decpcap.txt README.md )
+
+FILECAPS=(
+	cap_net_admin,cap_net_raw usr/bin/nethogs
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.8-meson.patch
+)
+
+src_prepare() {
+	default
+
+	cat <<-EOF > determineVersion.sh || die
+	#!/bin/sh
+	printf "${PV}"
+	EOF
+	chmod +x determineVersion.sh || die
+}
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 1f43e9121e82..7295f0f20db9 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -34,8 +34,8 @@ DIST zabbix-7.2.2.tar.gz 40372426 BLAKE2B 3cff418340428aa1de6cdbe00e5eef34068ea4
 EBUILD zabbix-5.0.45.ebuild 9819 BLAKE2B 7be0b02fa0842b250033f883c48f41963d6a0998054fa443ef26c910ffb77c1c1e40e54628fd90de8a8a24c20f45783d7570408a40e6eef727a1fd0ecaabfc3b SHA512 793e988e130abde40652ef3e9d594c46918332aa11da855b68196f23ffd206d237a21d031b21a836ab2ec19b1bdd860b21f8733631f9b2874b51787dc9b681d3
 EBUILD zabbix-6.0.37.ebuild 9934 BLAKE2B ee1b32073c412b637b7f09090af0e2d038339c9cafe6ce777213ae57b477e6dc6c5b971ed3ab5c0c7fafc54ba20fed78380607be02569a89710268d95f76eba0 SHA512 99d73fc81c0e27ced8872e0bd96b1bc547f4dfb5b5318854994c69b1026e23c3a991c75475ec50d098c21b38505e81db900aa5f230c302b0dd0d009bb37fadab
 EBUILD zabbix-6.4.20.ebuild 10035 BLAKE2B 9e857bb98ddbb1113728eedff05e3f1c510c73b9448035b378079635eb18bc8b40459267d6ed9d98339ef99428a15dc5725e93e8e45dfe6395d02ee056073955 SHA512 60248c83b12efe4d84bfc071955190899f28686578f2784530e7f8aacd87fe4146d6d828b02fb3ecc3c7e381716bb9d1f3f9686bb23a391baa62c8de6dcd226e
-EBUILD zabbix-7.0.7.ebuild 9369 BLAKE2B ab2ea1d0f7b3c6d1ffa4d79a532d43d162b1100cf861ad4b6873ab30bc6086e85871cce6efb361773fc12ca1e165035081e992426a2432d3ca662ddeeef160fb SHA512 48fa16d95fe2ee356535a6b6936f6b07109a19484af75ccd986b224db3d08c062f0681ed8688c811c30e28e182ef65da3e92e3d72f7cf81123c815d44f5670fc
+EBUILD zabbix-7.0.7.ebuild 9368 BLAKE2B 3ed2016579ecf95deae44d7dead28b1d700d4b8b7544f0f54df36b8bd5b4d6f77a4dcb913719ca73e06679198fb372379103e5acb5b80f259fac816eeb4e1616 SHA512 142eac7c96dec6a5b5479c63c3b4757da4bc65db399afd7119cb9795563b85666612fc4981ef277d2171a0f8f057972bbde5d77748e1f079e953490511b5b448
 EBUILD zabbix-7.0.8.ebuild 9370 BLAKE2B 86fbcf288b615cbae2bd8385937aee3f1e8010cda421a3d60cae71903de413f5febe7bc1511529813c85249aa51ed9f22c98af9c37e4ab4310ec645d98a3914e SHA512 12d8db9426e1806ae656ddec2466cb5b62cf3c7de1dbd8fde26eb5fca3e13983d424bfda4578da4ce1a033354c6612a03a2e75558551c0bfbc959e15e21d7775
-EBUILD zabbix-7.2.1.ebuild 9369 BLAKE2B ab2ea1d0f7b3c6d1ffa4d79a532d43d162b1100cf861ad4b6873ab30bc6086e85871cce6efb361773fc12ca1e165035081e992426a2432d3ca662ddeeef160fb SHA512 48fa16d95fe2ee356535a6b6936f6b07109a19484af75ccd986b224db3d08c062f0681ed8688c811c30e28e182ef65da3e92e3d72f7cf81123c815d44f5670fc
+EBUILD zabbix-7.2.1.ebuild 9368 BLAKE2B 3ed2016579ecf95deae44d7dead28b1d700d4b8b7544f0f54df36b8bd5b4d6f77a4dcb913719ca73e06679198fb372379103e5acb5b80f259fac816eeb4e1616 SHA512 142eac7c96dec6a5b5479c63c3b4757da4bc65db399afd7119cb9795563b85666612fc4981ef277d2171a0f8f057972bbde5d77748e1f079e953490511b5b448
 EBUILD zabbix-7.2.2.ebuild 9370 BLAKE2B 86fbcf288b615cbae2bd8385937aee3f1e8010cda421a3d60cae71903de413f5febe7bc1511529813c85249aa51ed9f22c98af9c37e4ab4310ec645d98a3914e SHA512 12d8db9426e1806ae656ddec2466cb5b62cf3c7de1dbd8fde26eb5fca3e13983d424bfda4578da4ce1a033354c6612a03a2e75558551c0bfbc959e15e21d7775
 MISC metadata.xml 1576 BLAKE2B 877e83a97b492fe256f3459332dacb4680b2ddeaaab34c077f1ead5eb387d8f5ef6f7cca85435eedc85cdb0db7243a805a8b49c5ef7b1b7dce39a9213b401eae SHA512 77d805096f0bcf2f3650216c69cb33c7dbbcdfc8b7c56066463ce5436af30dd0e9b8c6d124b59bfdbdac4c18aa628c92f78722920284622065af0ddb6448cd3d
diff --git a/net-analyzer/zabbix/zabbix-7.0.7.ebuild b/net-analyzer/zabbix/zabbix-7.0.7.ebuild
index aaca68e952a5..44d89bbbef48 100644
--- a/net-analyzer/zabbix/zabbix-7.0.7.ebuild
+++ b/net-analyzer/zabbix/zabbix-7.0.7.ebuild
@@ -26,7 +26,7 @@ S=${WORKDIR}/${MY_P}
 LICENSE="AGPL-3"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl +postgres proxy selinux server snmp sqlite ssh static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	?? ( gnutls openssl )
diff --git a/net-analyzer/zabbix/zabbix-7.2.1.ebuild b/net-analyzer/zabbix/zabbix-7.2.1.ebuild
index aaca68e952a5..44d89bbbef48 100644
--- a/net-analyzer/zabbix/zabbix-7.2.1.ebuild
+++ b/net-analyzer/zabbix/zabbix-7.2.1.ebuild
@@ -26,7 +26,7 @@ S=${WORKDIR}/${MY_P}
 LICENSE="AGPL-3"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl +postgres proxy selinux server snmp sqlite ssh static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	?? ( gnutls openssl )