1 |
commit: f5374dba40cb6dbd24accfae7f9a07c6a58a7d61 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 1 00:34:26 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 1 00:34:26 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5374dba |
7 |
|
8 |
net-analyzer/nfdump: drop 1.6.23, 1.6.23-r1 |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
net-analyzer/nfdump/Manifest | 1 - |
13 |
.../nfdump/files/nfdump-1.6.19-compiler.patch | 21 -- |
14 |
.../nfdump/files/nfdump-1.6.23-autotools.patch | 216 --------------------- |
15 |
.../files/nfdump-1.6.23-m4-dir-automake.patch | 23 --- |
16 |
.../nfdump/files/nfdump-1.6.23-m4-dir.patch | 19 -- |
17 |
net-analyzer/nfdump/nfdump-1.6.23-r1.ebuild | 83 -------- |
18 |
net-analyzer/nfdump/nfdump-1.6.23.ebuild | 82 -------- |
19 |
7 files changed, 445 deletions(-) |
20 |
|
21 |
diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest |
22 |
index b3729d0617ac..2e99529dd136 100644 |
23 |
--- a/net-analyzer/nfdump/Manifest |
24 |
+++ b/net-analyzer/nfdump/Manifest |
25 |
@@ -1,3 +1,2 @@ |
26 |
-DIST nfdump-1.6.23.tar.gz 568879 BLAKE2B ca844f87e02fb3761d5b470cac11beada9873b0c7e3e9ca7ccc7899d57f0cfd96329698ac84467a55d683e83ce16c2b114a571845c7cb6069addcdd5d4a43903 SHA512 e3f79af69a170985fcbd1757fab86e90840d040cf7a6214c7f9851ed59695d3844a15269904c3ba989b6b6ed2ddf29fd19a493165d3037e49aa2bb69b831f168 |
27 |
DIST nfdump-1.6.24.tar.gz 647945 BLAKE2B 6f054c7ccdbc6c5052d1c4655509414b9acc7de320152e932dd31d6cc9eb915b73efa29e42a212ea206c4619c9e025bfd751762808fd8136c38d4edb72f4fabf SHA512 b1e092663ce245247af721565139eb0a264918747e6c0695c59f0b70a99049e92d79674d75c248f60aa832949d7e13027887cc825e393fce7dc5571771bce1d7 |
28 |
DIST nfdump-1.7.0.1.tar.gz 740435 BLAKE2B dd3d3e63aa076b32e0c9e897b40d3ee8368990792b1a483b69a448dadd7389c23df9800910baad0c5a241a480c5961616c70040fdce992b2a67e3be6680e715b SHA512 5b5da57016dc826650ba80a80a881ab89034778316f47c6797dbc902ed6af6d77cfb722356c3a1d92a4239a934178df56ff4c6cb3bf77e029232e02b905ec1a8 |
29 |
|
30 |
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.19-compiler.patch b/net-analyzer/nfdump/files/nfdump-1.6.19-compiler.patch |
31 |
deleted file mode 100644 |
32 |
index 8826c50c9dc2..000000000000 |
33 |
--- a/net-analyzer/nfdump/files/nfdump-1.6.19-compiler.patch |
34 |
+++ /dev/null |
35 |
@@ -1,21 +0,0 @@ |
36 |
---- a/configure.ac |
37 |
-+++ b/configure.ac |
38 |
-@@ -9,8 +9,6 @@ |
39 |
- AM_INIT_AUTOMAKE([subdir-objects]) |
40 |
- |
41 |
- # Checks for programs. |
42 |
--CFLAGS="-g -O3" |
43 |
--AC_PROG_CC([clang gcc]) |
44 |
- AX_CHECK_C11 |
45 |
- CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn -fno-strict-aliasing" |
46 |
- |
47 |
---- a/bin/Makefile.am |
48 |
-+++ b/bin/Makefile.am |
49 |
-@@ -30,7 +30,6 @@ |
50 |
- LDADD = $(DEPS_LIBS) |
51 |
- |
52 |
- #Add extra debug info for gdb |
53 |
--AM_CFLAGS = -ggdb |
54 |
- |
55 |
- # libnfdump sources |
56 |
- output = output_util.h output_util.c output_raw.h output_raw.c |
57 |
|
58 |
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.23-autotools.patch b/net-analyzer/nfdump/files/nfdump-1.6.23-autotools.patch |
59 |
deleted file mode 100644 |
60 |
index 65558bbe7dfa..000000000000 |
61 |
--- a/net-analyzer/nfdump/files/nfdump-1.6.23-autotools.patch |
62 |
+++ /dev/null |
63 |
@@ -1,216 +0,0 @@ |
64 |
-https://github.com/phaag/nfdump/commit/e6261098570f69ad973a7a4ea7aaebb1663712e8 |
65 |
-https://github.com/phaag/nfdump/commit/67da975f20076751bce49caf57c89ed21ed92ad0 |
66 |
-https://github.com/phaag/nfdump/commit/4652c2014012a81438f53cb590687c8c93419140 |
67 |
- |
68 |
-From: Peter Haag <flow-dev@×××××.ch> |
69 |
-Date: Tue, 22 Feb 2022 10:54:19 +0100 |
70 |
-Subject: [PATCH] Fix issue #304 - accept CFLAGS |
71 |
- |
72 |
---- a/configure.ac |
73 |
-+++ b/configure.ac |
74 |
-@@ -8,8 +8,11 @@ AC_INIT(nfdump, 1.6.23, peter@××××××××××××××××.net) |
75 |
- AC_CONFIG_HEADER([config.h]) |
76 |
- AM_INIT_AUTOMAKE([subdir-objects]) |
77 |
- |
78 |
-+if test "x$CFLAGS" = "x"; then |
79 |
-+ CFLAGS="-g -O3" |
80 |
-+fi |
81 |
-+ |
82 |
- # Checks for programs. |
83 |
--CFLAGS="-g -O3" |
84 |
- AC_PROG_CC([clang gcc]) |
85 |
- AX_CHECK_C11 |
86 |
- CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn -fno-strict-aliasing" |
87 |
- |
88 |
-From: Peter Haag <peter@××××××××××××××××.net> |
89 |
-Date: Fri, 25 Feb 2022 09:12:27 +0100 |
90 |
-Subject: [PATCH] Cleanup automake files. Fixes #304. |
91 |
- |
92 |
---- a/configure.ac |
93 |
-+++ b/configure.ac |
94 |
-@@ -1,12 +1,13 @@ |
95 |
- # -*- Autoconf -*- |
96 |
- # Process this file with autoconf to produce a configure script. |
97 |
- |
98 |
--AC_PREREQ(2.59) |
99 |
-+AC_PREREQ([2.71]) |
100 |
- AC_REVISION($Revision: 244 $)dnl |
101 |
--AC_INIT(nfdump, 1.6.23, peter@××××××××××××××××.net) |
102 |
-+AC_INIT([nfdump],[1.6.23],[peter@××××××××××××××××.net]) |
103 |
- |
104 |
--AC_CONFIG_HEADER([config.h]) |
105 |
-+AC_CONFIG_HEADERS([config.h]) |
106 |
- AM_INIT_AUTOMAKE([subdir-objects]) |
107 |
-+AC_CONFIG_MACRO_DIRS([m4]) |
108 |
- |
109 |
- if test "x$CFLAGS" = "x"; then |
110 |
- CFLAGS="-g -O3" |
111 |
-@@ -15,7 +16,12 @@ fi |
112 |
- # Checks for programs. |
113 |
- AC_PROG_CC([clang gcc]) |
114 |
- AX_CHECK_C11 |
115 |
--CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn -fno-strict-aliasing" |
116 |
-+AX_APPEND_FLAG([-Wall], [CFLAGS]) |
117 |
-+AX_APPEND_FLAG([-Wstrict-prototypes], [CFLAGS]) |
118 |
-+AX_APPEND_FLAG([-Wmissing-prototypes], [CFLAGS]) |
119 |
-+AX_APPEND_FLAG([-Wmissing-declarations], [CFLAGS]) |
120 |
-+AX_APPEND_FLAG([-Wmissing-noreturn], [CFLAGS]) |
121 |
-+AX_APPEND_FLAG([-fno-strict-aliasing], [CFLAGS]) |
122 |
- |
123 |
- LT_INIT |
124 |
- |
125 |
-@@ -59,7 +65,7 @@ if test "${enable_fixtimebug}" = "yes" ; then |
126 |
- fi |
127 |
- |
128 |
- AC_PROG_YACC |
129 |
--AC_PROG_LEX |
130 |
-+AC_PROG_LEX(yywrap) |
131 |
- which $LEX > /dev/null 2>&1 |
132 |
- if test $? = 1; then |
133 |
- AC_MSG_ERROR(No lex or flex found on system) |
134 |
-@@ -312,7 +318,11 @@ AC_LINK_IFELSE( |
135 |
- |
136 |
- # Checks for header files. |
137 |
- AC_HEADER_DIRENT |
138 |
--AC_HEADER_STDC |
139 |
-+# Autoupdate added the next two lines to ensure that your configure |
140 |
-+# script's behavior did not change. They are probably safe to remove. |
141 |
-+AC_CHECK_INCLUDES_DEFAULT |
142 |
-+AC_PROG_EGREP |
143 |
-+ |
144 |
- AC_CHECK_HEADERS(stdio_ext.h) |
145 |
- AC_CHECK_HEADERS([nameser8_compat.h]) |
146 |
- AC_CHECK_HEADERS([features.h arpa/inet.h fcntl.h netinet/in.h fts.h stdint.h stdlib.h stddef.h string.h sys/socket.h syslog.h unistd.h iso/limits_iso.h]) |
147 |
-@@ -404,17 +414,14 @@ AC_CHECK_FUNCS(memcmp memcpy memmove memset) |
148 |
- AC_MSG_CHECKING([for union semun]) |
149 |
- AC_CACHE_VAL(ac_cv_struct_semun, |
150 |
- [ |
151 |
-- AC_TRY_COMPILE( |
152 |
-- [ |
153 |
-+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
154 |
- #include <sys/types.h> |
155 |
- #include <sys/ipc.h> |
156 |
- #include <sys/sem.h>; |
157 |
-- ], |
158 |
-- [ |
159 |
-+ ]], [[ |
160 |
- union semun semdat; |
161 |
-- ], |
162 |
-- ac_cv_struct_semun=yes, ac_cv_struct_semun=no |
163 |
-- ) |
164 |
-+ ]])],[ac_cv_struct_semun=yes],[ac_cv_struct_semun=no |
165 |
-+ ]) |
166 |
- ] |
167 |
- ) |
168 |
- |
169 |
-@@ -424,7 +431,7 @@ if test "$ac_cv_struct_semun" = "yes"; then |
170 |
- fi |
171 |
- |
172 |
- AC_MSG_CHECKING(for the %z format string in printf()) |
173 |
--AC_TRY_RUN([ |
174 |
-+AC_RUN_IFELSE([AC_LANG_SOURCE([[ |
175 |
- #include <stdio.h> |
176 |
- #include <sys/types.h> |
177 |
- |
178 |
-@@ -438,28 +445,38 @@ char string[16]; |
179 |
- |
180 |
- return i == 5 ? 0 : 1; |
181 |
- } |
182 |
--], |
183 |
--[ |
184 |
-+]])],[ |
185 |
- AC_MSG_RESULT(yes) |
186 |
- AC_DEFINE([HAVE_SIZE_T_Z_FORMAT], [1], |
187 |
- [Define to 1 if you have a printf() that supports the %z format string.]) |
188 |
--], |
189 |
--[ |
190 |
-+],[ |
191 |
- AC_MSG_RESULT(no) |
192 |
--], |
193 |
--[ |
194 |
-+],[ |
195 |
- AC_MSG_RESULT(no) |
196 |
--] |
197 |
--) |
198 |
- |
199 |
-+]) |
200 |
-+ |
201 |
-+AC_CONFIG_FILES([Makefile bin/Makefile man/Makefile]) |
202 |
-+AC_CONFIG_FILES([doc/Makefile]) |
203 |
- AC_PATH_PROG([DOXYGEN], [doxygen], []) |
204 |
- AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$DOXYGEN"]) |
205 |
- AM_COND_IF([HAVE_DOXYGEN], AC_CONFIG_FILES([doc/Doxyfile])) |
206 |
--AC_OUTPUT(doc/Makefile) |
207 |
-- |
208 |
--#AC_CONFIG_FILES([Makefile]) |
209 |
--AC_OUTPUT(Makefile bin/Makefile man/Makefile) |
210 |
-+AC_OUTPUT |
211 |
- |
212 |
-+echo "" |
213 |
-+echo "----------------------------------" |
214 |
-+echo " Build Settings for ${PACKAGE_TARNAME} v${PACKAGE_VERSION}" |
215 |
-+echo "----------------------------------" |
216 |
-+echo " host type = $host_os" |
217 |
-+echo " install dir = $prefix" |
218 |
-+echo " CC = $CC" |
219 |
-+echo " CFLAGS = $AM_CFLAGS $CFLAGS" |
220 |
-+echo " CPPFLAGS = $AM_CPPFLAGS $CPPFLAGS" |
221 |
-+echo " LDFLAGS = $AM_LDFLAGS $LDFLAGS" |
222 |
-+echo " LIBS = $LIBS" |
223 |
-+echo "----------------------------------" |
224 |
-+echo "" |
225 |
-+echo " You can run ./make now." |
226 |
- echo "" |
227 |
- echo "* Many thanks for using nfdump tools" |
228 |
- echo "* Please send bug reports back to me: peter@××××××××××××××××.net" |
229 |
- |
230 |
-From: Peter Haag <peter@××××××××××××××××.net> |
231 |
-Date: Thu, 3 Mar 2022 09:25:15 +0100 |
232 |
-Subject: [PATCH] Make configure.ac autoconf 2.69 compatible |
233 |
- |
234 |
---- a/configure.ac |
235 |
-+++ b/configure.ac |
236 |
-@@ -1,7 +1,7 @@ |
237 |
- # -*- Autoconf -*- |
238 |
- # Process this file with autoconf to produce a configure script. |
239 |
- |
240 |
--AC_PREREQ([2.71]) |
241 |
-+AC_PREREQ([2.69]) |
242 |
- AC_REVISION($Revision: 244 $)dnl |
243 |
- AC_INIT([nfdump],[1.6.23],[peter@××××××××××××××××.net]) |
244 |
- |
245 |
-@@ -47,7 +47,7 @@ if test "${enable_jnat}" = "yes" ; then |
246 |
- fi |
247 |
- |
248 |
- if test "${enable_nsel}" = "yes" -a "${enable_jnat}" = "yes"; then |
249 |
-- AC_MSG_ERROR(You can use only one of --enable-nsel or --enable-jnat. CISCO and Juniper are not compatible.) |
250 |
-+ AC_MSG_ERROR([You can use only one of --enable-nsel or --enable-jnat. CISCO and Juniper are not compatible.]) |
251 |
- fi |
252 |
- |
253 |
- AC_ARG_ENABLE(nel, |
254 |
-@@ -287,7 +287,6 @@ AC_SUBST(FT_INCLUDES) |
255 |
- AC_SUBST(FT_LDFLAGS) |
256 |
- AC_SUBST(LFLAGS) |
257 |
- |
258 |
-- |
259 |
- # Checks for libraries. |
260 |
- AC_CHECK_FUNCS(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname,,[AC_CHECK_LIB(socket,gethostbyname)])]) |
261 |
- AC_CHECK_FUNCS(setsockopt,,[AC_CHECK_LIB(socket,setsockopt)]) |
262 |
-@@ -447,8 +446,7 @@ char string[16]; |
263 |
- } |
264 |
- ]])],[ |
265 |
- AC_MSG_RESULT(yes) |
266 |
-- AC_DEFINE([HAVE_SIZE_T_Z_FORMAT], [1], |
267 |
-- [Define to 1 if you have a printf() that supports the %z format string.]) |
268 |
-+ AC_DEFINE([HAVE_SIZE_T_Z_FORMAT], [1], [Define to 1 if you have a printf() that supports the %z format string.]) |
269 |
- ],[ |
270 |
- AC_MSG_RESULT(no) |
271 |
- ],[ |
272 |
---- /dev/null |
273 |
-+++ b/m4/extensions.m4 |
274 |
-@@ -0,0 +1,4 @@ |
275 |
-+dnl Define to empty for the benefit of Autoconf 2.69 |
276 |
-+dnl AC_USE_SYSTEM_EXTENSIONS (below) can be used unchanged from Autoconf 2.70+. |
277 |
-+m4_ifndef([AC_CHECK_INCLUDES_DEFAULT], |
278 |
-+ [AC_DEFUN([AC_CHECK_INCLUDES_DEFAULT], [])]) |
279 |
- |
280 |
|
281 |
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir-automake.patch b/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir-automake.patch |
282 |
deleted file mode 100644 |
283 |
index 755db8b7cf5d..000000000000 |
284 |
--- a/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir-automake.patch |
285 |
+++ /dev/null |
286 |
@@ -1,23 +0,0 @@ |
287 |
-https://github.com/phaag/nfdump/pull/336 |
288 |
- |
289 |
-From e882722e4e006d0440fb5a37fb051d4747e4f225 Mon Sep 17 00:00:00 2001 |
290 |
-From: Sam James <sam@g.o> |
291 |
-Date: Thu, 24 Mar 2022 22:50:13 +0000 |
292 |
-Subject: [PATCH] Makefile.am: add ACLOCAL_AMFLAGS |
293 |
- |
294 |
-Per autoconf docs [0], if using automake and AC_CONFIG_MACRO_DIR, |
295 |
-we need to include ACLOCAL_AMFLAGS in Makefile.am. |
296 |
- |
297 |
-So, let's set ACLOCAL_AMFLAGS = -I m4. |
298 |
- |
299 |
-This sorts out an automake warning. |
300 |
- |
301 |
-Signed-off-by: Sam James <sam@g.o> |
302 |
---- a/Makefile.am |
303 |
-+++ b/Makefile.am |
304 |
-@@ -1,3 +1,4 @@ |
305 |
-+ACLOCAL_AMFLAGS = -I m4 |
306 |
- |
307 |
- SUBDIRS = . bin man doc |
308 |
- |
309 |
- |
310 |
|
311 |
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir.patch b/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir.patch |
312 |
deleted file mode 100644 |
313 |
index ac25ee094653..000000000000 |
314 |
--- a/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir.patch |
315 |
+++ /dev/null |
316 |
@@ -1,19 +0,0 @@ |
317 |
-Variant sent upstream (configure.ac hunk irrelevant now): https://github.com/phaag/nfdump/pull/336 |
318 |
-https://bugs.gentoo.org/832420 |
319 |
---- a/Makefile.am |
320 |
-+++ b/Makefile.am |
321 |
-@@ -1,3 +1,4 @@ |
322 |
-+ACLOCAL_AMFLAGS = -I m4 |
323 |
- |
324 |
- SUBDIRS = . bin man doc |
325 |
- |
326 |
---- a/configure.ac |
327 |
-+++ b/configure.ac |
328 |
-@@ -7,6 +7,7 @@ AC_INIT(nfdump, 1.6.23, peter@××××××××××××××××.net) |
329 |
- |
330 |
- AC_CONFIG_HEADER([config.h]) |
331 |
- AM_INIT_AUTOMAKE([subdir-objects]) |
332 |
-+AC_CONFIG_MACRO_DIR([m4]) |
333 |
- |
334 |
- # Checks for programs. |
335 |
- AX_CHECK_C11 |
336 |
|
337 |
diff --git a/net-analyzer/nfdump/nfdump-1.6.23-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.23-r1.ebuild |
338 |
deleted file mode 100644 |
339 |
index 34bb2bd90adb..000000000000 |
340 |
--- a/net-analyzer/nfdump/nfdump-1.6.23-r1.ebuild |
341 |
+++ /dev/null |
342 |
@@ -1,83 +0,0 @@ |
343 |
-# Copyright 1999-2022 Gentoo Authors |
344 |
-# Distributed under the terms of the GNU General Public License v2 |
345 |
- |
346 |
-EAPI=8 |
347 |
- |
348 |
-inherit autotools toolchain-funcs |
349 |
- |
350 |
-DESCRIPTION="A set of tools to collect and process netflow data" |
351 |
-HOMEPAGE="https://github.com/phaag/nfdump" |
352 |
-SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
353 |
- |
354 |
-LICENSE="BSD" |
355 |
-SLOT="0/${PV}" |
356 |
-KEYWORDS="~amd64 ~x86" |
357 |
-IUSE="debug doc jnat ftconv nfpcapd nfprofile nftrack nsel readpcap sflow" |
358 |
- |
359 |
-REQUIRED_USE="?? ( jnat nsel )" |
360 |
- |
361 |
-RDEPEND=" |
362 |
- app-arch/bzip2 |
363 |
- sys-libs/zlib |
364 |
- ftconv? ( net-analyzer/flow-tools ) |
365 |
- nfpcapd? ( net-libs/libpcap ) |
366 |
- nfprofile? ( net-analyzer/rrdtool ) |
367 |
- nftrack? ( net-analyzer/rrdtool ) |
368 |
- readpcap? ( net-libs/libpcap ) |
369 |
-" |
370 |
-DEPEND="${RDEPEND}" |
371 |
-BDEPEND=" |
372 |
- sys-devel/flex |
373 |
- virtual/yacc |
374 |
- doc? ( |
375 |
- app-doc/doxygen |
376 |
- media-gfx/graphviz |
377 |
- ) |
378 |
-" |
379 |
- |
380 |
-PATCHES=( |
381 |
- "${FILESDIR}"/${P}-autotools.patch |
382 |
- "${FILESDIR}"/${P}-m4-dir-automake.patch |
383 |
- "${FILESDIR}"/${PN}-1.6.19-libft.patch |
384 |
-) |
385 |
- |
386 |
-DOCS=( AUTHORS ChangeLog README.md ) |
387 |
- |
388 |
-src_prepare() { |
389 |
- default |
390 |
- |
391 |
- eautoreconf |
392 |
- |
393 |
- if use doc; then |
394 |
- doxygen -u doc/Doxyfile.in || die |
395 |
- fi |
396 |
-} |
397 |
- |
398 |
-src_configure() { |
399 |
- tc-export CC |
400 |
- |
401 |
- # --without-ftconf is not handled well, bug #322201 |
402 |
- econf \ |
403 |
- $(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \ |
404 |
- $(use nfpcapd && echo --enable-nfpcapd) \ |
405 |
- $(use nfprofile && echo --enable-nfprofile) \ |
406 |
- $(use nftrack && echo --enable-nftrack) \ |
407 |
- $(use_enable debug devel) \ |
408 |
- $(use_enable jnat) \ |
409 |
- $(use_enable nsel) \ |
410 |
- $(use_enable readpcap) \ |
411 |
- $(use_enable sflow) |
412 |
-} |
413 |
- |
414 |
-src_install() { |
415 |
- default |
416 |
- |
417 |
- find "${ED}" -name '*.la' -delete || die |
418 |
- |
419 |
- newinitd "${FILESDIR}"/nfcapd.initd nfcapd |
420 |
- newconfd "${FILESDIR}"/nfcapd.confd nfcapd |
421 |
- |
422 |
- if use doc; then |
423 |
- dodoc -r doc/html |
424 |
- fi |
425 |
-} |
426 |
|
427 |
diff --git a/net-analyzer/nfdump/nfdump-1.6.23.ebuild b/net-analyzer/nfdump/nfdump-1.6.23.ebuild |
428 |
deleted file mode 100644 |
429 |
index dca53c21054e..000000000000 |
430 |
--- a/net-analyzer/nfdump/nfdump-1.6.23.ebuild |
431 |
+++ /dev/null |
432 |
@@ -1,82 +0,0 @@ |
433 |
-# Copyright 1999-2022 Gentoo Authors |
434 |
-# Distributed under the terms of the GNU General Public License v2 |
435 |
- |
436 |
-EAPI=7 |
437 |
- |
438 |
-inherit autotools |
439 |
- |
440 |
-DESCRIPTION="A set of tools to collect and process netflow data" |
441 |
-HOMEPAGE="https://github.com/phaag/nfdump" |
442 |
-SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
443 |
- |
444 |
-LICENSE="BSD" |
445 |
-SLOT="0/${PV}" |
446 |
-KEYWORDS="amd64 x86" |
447 |
-IUSE="debug doc jnat ftconv nfpcapd nfprofile nftrack nsel readpcap sflow" |
448 |
- |
449 |
-REQUIRED_USE="?? ( jnat nsel )" |
450 |
- |
451 |
-RDEPEND=" |
452 |
- app-arch/bzip2 |
453 |
- sys-libs/zlib |
454 |
- ftconv? ( net-analyzer/flow-tools ) |
455 |
- nfpcapd? ( net-libs/libpcap ) |
456 |
- nfprofile? ( net-analyzer/rrdtool ) |
457 |
- nftrack? ( net-analyzer/rrdtool ) |
458 |
- readpcap? ( net-libs/libpcap ) |
459 |
-" |
460 |
-DEPEND="${RDEPEND}" |
461 |
-BDEPEND=" |
462 |
- sys-devel/flex |
463 |
- virtual/yacc |
464 |
- doc? ( |
465 |
- app-doc/doxygen |
466 |
- media-gfx/graphviz |
467 |
- ) |
468 |
-" |
469 |
- |
470 |
-PATCHES=( |
471 |
- "${FILESDIR}"/${PN}-1.6.19-compiler.patch |
472 |
- "${FILESDIR}"/${PN}-1.6.19-libft.patch |
473 |
- "${FILESDIR}"/${PN}-1.6.23-m4-dir.patch |
474 |
-) |
475 |
- |
476 |
-DOCS=( AUTHORS ChangeLog README.md ) |
477 |
- |
478 |
-src_prepare() { |
479 |
- default |
480 |
- |
481 |
- eautoreconf |
482 |
- |
483 |
- if use doc; then |
484 |
- doxygen -u doc/Doxyfile.in || die |
485 |
- fi |
486 |
-} |
487 |
- |
488 |
-src_configure() { |
489 |
- # --without-ftconf is not handled well, bug #322201 |
490 |
- econf \ |
491 |
- $(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \ |
492 |
- $(use nfpcapd && echo --enable-nfpcapd) \ |
493 |
- $(use nfprofile && echo --enable-nfprofile) \ |
494 |
- $(use nftrack && echo --enable-nftrack) \ |
495 |
- $(use_enable debug devel) \ |
496 |
- $(use_enable jnat) \ |
497 |
- $(use_enable nsel) \ |
498 |
- $(use_enable readpcap) \ |
499 |
- $(use_enable sflow) \ |
500 |
- --disable-static |
501 |
-} |
502 |
- |
503 |
-src_install() { |
504 |
- default |
505 |
- |
506 |
- find "${ED}" -name '*.la' -delete || die |
507 |
- |
508 |
- newinitd "${FILESDIR}"/nfcapd.initd nfcapd |
509 |
- newconfd "${FILESDIR}"/nfcapd.confd nfcapd |
510 |
- |
511 |
- if use doc; then |
512 |
- dodoc -r doc/html |
513 |
- fi |
514 |
-} |