gentoo auto-resync : 29:03:2025 - 00:32:15

8 files changed, 42 insertions, 25 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 09b39f45d19b..f5fc6bcc8b4d 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/speedtest-cli/Manifest b/net-analyzer/speedtest-cli/Manifest
index 140bd59cf1cc..599dc837c05f 100644
--- a/net-analyzer/speedtest-cli/Manifest
+++ b/net-analyzer/speedtest-cli/Manifest
@@ -1,4 +1,4 @@
 AUX speedtest-cli-2.1.3-json-serverlist.patch 3481 BLAKE2B b01c81d272cfc3bb406332fee7472f2c114ec13ea2e16281173c932e55e0177d08e6580ac682e4fba6e72b9957c3f67927bfd030cdae74e2f852f80da1a043ac SHA512 2280b41befdeac3b8be8c5218a7632fea21f9bc886b220ce9801e8287f60de980085ac191a1c81330bc92b4611a06bb2e97e90b34b7b5c904981d546e4971959
 DIST speedtest-cli-2.1.3.tar.gz 24771 BLAKE2B 70c604848ffa29ae0a28a636a40ffdd278000c865b243038f773d20a4f6f1c668704505c8bae302d84a0957b2a6ad9d4b303e2e9371b351348d7147ff9a5a67d SHA512 e2ecd9b4eea95e3641045c3da217ec5a39846b26c1f773fdd31c6ffe3cb5e35341320fc1992f865af48afd1a704c4d4224f9ec4048abb69131ee2f32385ae94c
-EBUILD speedtest-cli-2.1.3-r2.ebuild 699 BLAKE2B 8031d2b9c06859f9609e11e01a8cebcb578cb75cca7ac66faf5570e413d5fbe1a02b014f7b0b8e770a7e2f307a76135e206a5a9f278ed851175081afe0fa9ef7 SHA512 20a6fccd40b7fc0d1d7e55aef0a32dee4fda1c504b317e6b36ff61365d0b649667ad5ffa68df3f4b600ca84439e5774060b92096d0a1c97ceed84597bb78fa1f
+EBUILD speedtest-cli-2.1.3-r2.ebuild 699 BLAKE2B 10e8c5a04f8abc0bbe11cbe1e10d1642cf958a09858247b850ec02ee4f2a0ab0abb9722c93374d972744cf24f985ef7c53636d0d24ff7b324913073125d49be9 SHA512 fb42fd67792e44dfad6f6c3cbbcc06bb3b0fa8b0add5a34d7a54b65b6f8e51e946c0ad87494e330e6062f8891e28da36dd19bb509906648d6caeed940557cc91
 MISC metadata.xml 335 BLAKE2B f1b79bcb4a155fa139e30ffd3f15adff28f9fb3c48bf004237c5ed585fecbd6ea0808e98473cb78e64fc6f3eca11f28d1bc1ea1fe74533fb611a3e9dc372775c SHA512 e68b95452606d13854bbc1e4af0fd56332363c8c42273655cdd6c5ae92619ff33157338a80d32ce1cd1a04d666058d536fe61e4f0334b4c2b71a033862fe0167
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-2.1.3-r2.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-2.1.3-r2.ebuild
index 50fd8d8ef75d..840deb02a1b9 100644
--- a/net-analyzer/speedtest-cli/speedtest-cli-2.1.3-r2.ebuild
+++ b/net-analyzer/speedtest-cli/speedtest-cli-2.1.3-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517="setuptools"
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1
 
diff --git a/net-analyzer/zmap/Manifest b/net-analyzer/zmap/Manifest
index 3bebffe0d9f8..f990ea0de46e 100644
--- a/net-analyzer/zmap/Manifest
+++ b/net-analyzer/zmap/Manifest
@@ -1,6 +1,7 @@
-AUX zmap-2.1.1-always-install-config.patch 973 BLAKE2B cdba75ff09b19c851234745cce6ff4a82bbca3b944b442885aab81eb7a10221cfe62f34d2842f3c4c7c8e38f19c25dcf2aacf155aed3bb8251840f9690175a9e SHA512 c583fd3acdbfb21ab613fac1c4cf0da82e2e0d1d7f537415f6eb5f0b7e5f0101c518c336590590f4a153c191c12fed1ba35c934bacc95cbf63053f43a80c8485
+AUX zmap-4.3.2-cmake.patch 401 BLAKE2B fda17df75fc23d80ed702b5d225875d4c3d95d20821d363bde46b7e1d238633eb538733e18b6e366d2e892368942be844a76b16a3c7cf1faf336d556687bbff4 SHA512 68959b13e996b72b7226ba91586cebe2e9ffbaa96e1f38ee7fd8a8be09d29763db0ebaff85f010a42968e32a3b5fd43392d8e137c0ab1350c8f1645ad03fabf2
+AUX zmap-4.3.2-pkgconfig.patch 752 BLAKE2B c7358d79eb5f5a61131d5db6eef4b090fcce84b96af3ec7956fb51633a07971d013c2f053c7592d7fdcdae72da406eec26ca7e6842b423f634c6a094a06d7bba SHA512 a844848c889fa0b57d867918917934a06e778ebc3d64caa0ee415d9c8f487038eb81ccfc7f6b0f8cb3db9350ea1a5e1bda09cf60e3b8d2bf4ab0b0e98df024d8
 DIST zmap-4.1.1.tar.gz 202697 BLAKE2B 35bc21e4d4c4c452deb2e34ac837ee4ae728b3adf97aefb5b88f55dde719bd78787b8a2826a89eaff92170b3eb2e5003194e3dc636616a845efef82bea663114 SHA512 eff32c9bda7b28a48fce85e3acb598c6adc8dc952ffec21cd4d581462e481a3cf61a6285a71c16741d8e9deedf7c8e3b71d4f375a931244b96acc8779c225929
 DIST zmap-4.3.2.tar.gz 211361 BLAKE2B 5b08ba0d45f7ceb877bda874df77000e1d16d6ee2db4eb7427ed7ed12c768b77f88183bfcc445e99c42016b8e2d45c5f1480dd16a96e6bb521e3723bf3646f55 SHA512 38dffacca5a49059e9711bd47a5a660d357adffb9f847b605c9eedbc8d5e3e2bfb5eb13a0fc9f20b48349a3278651c85da301b48741efb3e2ee751bbd4877104
 EBUILD zmap-4.1.1.ebuild 888 BLAKE2B 38980f64ddff54cacca375e28b0d147ecbb0750e56d43ad34e570d0f67cfd003dbfb95030800abeee1a568c57577d05a4a2ab533338885a8300fde488496df27 SHA512 35ed40884e06308a77acd5f60400320edc3c63d34857bcfb22d632e793d04db343078f5127a1ed2e44e164281c0d722588c33cb763c54ea7d874c4af424175e1
-EBUILD zmap-4.3.2.ebuild 951 BLAKE2B 4b90cdd1a3ca729f2ad2e6bc7c5088e0cd6fdfca545ed46d09ad869be8e2632b00d000588934a26e9e1dd3ab0e295a6926be3415bb849a14e33e6935a96ee222 SHA512 9ee4235572f7b08a858e1c676cb42061f5afd94090b1d967c674b0f2ae7f8507c87300844ba0f9ae70ee5230df6ef566984426edc23aa5b42caf9624cc7a9b23
+EBUILD zmap-4.3.2.ebuild 1088 BLAKE2B 6840377be3a17786fc205b3e47bc45cae633c14ee07c06124ac64603e07bb4902d573acccab9e3fd86449e9c2948353735ae02a3a9bd09e0b73ec3bafd75000f SHA512 ccd405577bed77d1eca6bc71317a21e8440f032b98485b5167d8f982c93ef7930d95eca1e8e4bf6f7fad7a456d7d6b0074c47f03425de9cdfac4b8c52df58d46
 MISC metadata.xml 779 BLAKE2B 627f1bba80700c5710a82cb4336b95bcf324cf084fd338a27d33dbebabd82faa8dbc77457d7eea81969650f86e7d637f1a12feff85470f0a47f7bcbf82c627f6 SHA512 87ac4be1654ca44e27515d0cacb707b3f43c02b36687270705da893540689856b4913e2da4733e25bad419814b73eadd9963c14aca1684552db3762e94ef9521
diff --git a/net-analyzer/zmap/files/zmap-2.1.1-always-install-config.patch b/net-analyzer/zmap/files/zmap-2.1.1-always-install-config.patch
deleted file mode 100644
index b3a8f9003dc5..000000000000
--- a/net-analyzer/zmap/files/zmap-2.1.1-always-install-config.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-We always want to install configs as the host machine may be different from
-the one where zmap is installed to. Plus we have CONFIG_PROTECT in Gentoo
-for protecting the user's existing configuration.
-
-Bug: https://bugs.gentoo.org/885707
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -135,11 +135,7 @@ message(STATUS "Default ZMap configuration file location is /etc/zmap")
- foreach(EACH_CONF ${CONF_FILES})
-     get_filename_component(CONF_BASENAME ${EACH_CONF} NAME)
-     message(STATUS "Checking if ${CONF_BASENAME} exists there...")
--    if(NOT EXISTS "/etc/zmap/${CONF_BASENAME}")
--        install(FILES ${EACH_CONF} DESTINATION ${CONFIG_DESTINATION})
--    else()
--        message(WARNING "Existing configuration file detected at /etc/zmap/${CONF_BASENAME}, ${CONF_BASENAME} from sources will NOT be installed. Please check and install manually!")
--    endif()
-+    install(FILES ${EACH_CONF} DESTINATION ${CONFIG_DESTINATION})
- endforeach()
- 
- # Allow Debian Packaging
diff --git a/net-analyzer/zmap/files/zmap-4.3.2-cmake.patch b/net-analyzer/zmap/files/zmap-4.3.2-cmake.patch
new file mode 100644
index 000000000000..683a5eb4d3ea
--- /dev/null
+++ b/net-analyzer/zmap/files/zmap-4.3.2-cmake.patch
@@ -0,0 +1,12 @@
+Compat with cmake-4
+https://github.com/zmap/zmap/pull/933.patch
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index baa524a..60e3839 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
++cmake_minimum_required(VERSION 3.5.0 FATAL_ERROR)
+ project(ZMAP C)
+ set(ZMAP_VERSION DEVELOPMENT) # Change DEVELOPMENT to version number for release
+ 
diff --git a/net-analyzer/zmap/files/zmap-4.3.2-pkgconfig.patch b/net-analyzer/zmap/files/zmap-4.3.2-pkgconfig.patch
new file mode 100644
index 000000000000..65388cc4d5c3
--- /dev/null
+++ b/net-analyzer/zmap/files/zmap-4.3.2-pkgconfig.patch
@@ -0,0 +1,18 @@
+use find_package to prevent failure without native-symlinks
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index baa524a..60e3839 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -85,11 +85,7 @@ if (NOT FOUND_LIBUNISTRING)
+     message(FATAL_ERROR "Missing dependency: did not find libunistring, please install libunistring or equivalent. More details in INSTALL.md")
+ endif()
+ 
+-find_program(FOUND_PKGCONFIG HINTS /usr/include/ NAMES pkg-config dev-util/pkgconf)
+-if (NOT FOUND_PKGCONFIG)
+-    message(FATAL_ERROR "Missing dependency: did not find pkg-config, please install pkg-config or equivalent. More details in INSTALL.md")
+-endif()
+-
++find_package(PkgConfig REQUIRED)
+ 
+ if(ENABLE_DEVELOPMENT)
+     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ggdb")
diff --git a/net-analyzer/zmap/zmap-4.3.2.ebuild b/net-analyzer/zmap/zmap-4.3.2.ebuild
index a5db6a5b7bd5..b38620088d21 100644
--- a/net-analyzer/zmap/zmap-4.3.2.ebuild
+++ b/net-analyzer/zmap/zmap-4.3.2.ebuild
@@ -31,6 +31,12 @@ BDEPEND="
 
 FILECAPS=( cap_net_raw=ep usr/sbin/zmap )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3.2-pkgconfig.patch
+	# Merged. To be removed at next version.
+	"${FILESDIR}"/${PN}-4.3.2-cmake.patch
+)
+
 DOCS=( AUTHORS CHANGELOG.md README.md examples )
 
 src_configure() {