[gentoo-commits] repo/gentoo:master commit in: net-analyzer/zmap/, net-analyzer/zmap/files/

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/zmap/, net-analyzer/zmap/files/

[Petr Vaněk]

commit:     06b60e91f324bbe618449fda820950e66f323936
Author:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 24 13:32:38 2024 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Tue Dec 24 13:32:38 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06b60e91

net-analyzer/zmap: drop 2.1.1-r5

Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>

 net-analyzer/zmap/Manifest                      |  1 -
 net-analyzer/zmap/files/zmap-2.1.1-json-c.patch | 31 --------------
 net-analyzer/zmap/zmap-2.1.1-r5.ebuild          | 57 -------------------------
 3 files changed, 89 deletions(-)

diff --git a/net-analyzer/zmap/Manifest b/net-analyzer/zmap/Manifest
index 0706d5d7fd6b..ac4fa3839db2 100644
--- a/net-analyzer/zmap/Manifest
+++ b/net-analyzer/zmap/Manifest
@@ -1,2 +1 @@
-DIST zmap-2.1.1.tar.gz 131689 BLAKE2B c4bcea835b080dca879c227691230ad135d1822db0b81245ea60963b0a78ac71fd64df7ddca5d5a762c3d7dc67f2d689fd9d0d13e0ee9be21033de75c61ebd1f SHA512 9d62dceff77fa20ff5945516b0766340366175947130bb844f19c11dac7676e658bcdedd6be29ffc945706aa3cdc0e4ac207bd127b618592769a4d3e75892857
 DIST zmap-4.1.1.tar.gz 202697 BLAKE2B 35bc21e4d4c4c452deb2e34ac837ee4ae728b3adf97aefb5b88f55dde719bd78787b8a2826a89eaff92170b3eb2e5003194e3dc636616a845efef82bea663114 SHA512 eff32c9bda7b28a48fce85e3acb598c6adc8dc952ffec21cd4d581462e481a3cf61a6285a71c16741d8e9deedf7c8e3b71d4f375a931244b96acc8779c225929

diff --git a/net-analyzer/zmap/files/zmap-2.1.1-json-c.patch b/net-analyzer/zmap/files/zmap-2.1.1-json-c.patch
deleted file mode 100644
index 78a80b801218..000000000000
--- a/net-analyzer/zmap/files/zmap-2.1.1-json-c.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5473b6a907ff47e813e8ac3509a0f63d1253023b Mon Sep 17 00:00:00 2001
-From: Martin Milata <martin@martinmilata.cz>
-Date: Wed, 1 Jul 2020 16:47:18 +0200
-Subject: [PATCH] Fix build against json-c-0.14 (#609)
-
-The new pkgconfig file contains two include directories:
-
-  Cflags: -I${includedir} -I${includedir}/json-c
-
-Apparently pkg_check_modules returns them as a semicolon-separated
-string ("CMake list"), which causes the build to fail when appended
-directly to CMAKE_C_FLAGS.
-
-Origin: backport, https://github.com/zmap/zmap/commit/5473b6a907ff47e813e8ac3509a0f63d1253023b
-Applied-Upstream: 3.0
----
- CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-Index: zmap-2.1.1/CMakeLists.txt
-===================================================================
---- zmap-2.1.1.orig/CMakeLists.txt	2024-01-23 15:29:55.436869754 -0500
-+++ zmap-2.1.1/CMakeLists.txt	2024-01-23 15:30:32.505023070 -0500
-@@ -72,6 +72,7 @@
-     endif()
- 
-     add_definitions("-DJSON")
-+    string(REPLACE ";" " " JSON_CFLAGS "${JSON_CFLAGS}")
-     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${JSON_CFLAGS}")
- endif()
- 

diff --git a/net-analyzer/zmap/zmap-2.1.1-r5.ebuild b/net-analyzer/zmap/zmap-2.1.1-r5.ebuild
deleted file mode 100644
index 2a7eb5b56829..000000000000
--- a/net-analyzer/zmap/zmap-2.1.1-r5.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake fcaps
-
-DESCRIPTION="Fast network scanner designed for Internet-wide network surveys"
-HOMEPAGE="https://zmap.io/"
-SRC_URI="https://github.com/zmap/zmap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
-IUSE="mongo redis"
-
-RDEPEND="
-	dev-libs/gmp:=
-	net-libs/libpcap
-	dev-libs/json-c:=
-	mongo? (
-		dev-db/mongodb
-		dev-libs/mongo-c-driver
-	)
-	redis? ( dev-libs/hiredis:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/gengetopt
-	app-alternatives/lex
-	dev-util/byacc
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.1-always-install-config.patch
-	"${FILESDIR}"/${PN}-2.1.1-json-c.patch
-)
-
-FILECAPS=( cap_net_raw=ep usr/sbin/zmap )
-
-src_prepare() {
-	sed \
-		-e '/ggo/s:CMAKE_CURRENT_SOURCE_DIR}:CMAKE_BINARY_DIR}/src:g' \
-		-i src/CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DEVELOPMENT=OFF
-		-DWITH_WERROR=OFF
-		-DWITH_MONGO="$(usex mongo)"
-		-DWITH_REDIS="$(usex redis)"
-	)
-
-	cmake_src_configure
-}