gentoo auto-resync : 19:04:2023 - 11:57:35

5 files changed, 4 insertions, 92 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 5cd1d2a41e46..58a449c10aad 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/flowgrind/Manifest b/net-analyzer/flowgrind/Manifest
index de017e241d73..96988615de0d 100644
--- a/net-analyzer/flowgrind/Manifest
+++ b/net-analyzer/flowgrind/Manifest
@@ -1,6 +1,3 @@
-AUX flowgrind-0.8.0-fno-common.patch 744 BLAKE2B 8b7f9f61b875a69e0087c526be21bb0c9cc917c38072b1dda47c77d3e5aa9ba9176742314ead8c03b9cb11e9552e78823f85f6d868f7210b3cd86db5f3df5789 SHA512 98ad53bffd36a7241c4091f5bd86699a699c0edbd4044ffc5861118fcde71ed17278ae3bb56ca95c9444eca04394a592bfce2c1dea35b1574d7fd42568b1797f
-DIST flowgrind-0.8.0.tar.bz2 298730 BLAKE2B e924c9900d24565dc025af47d57173d828eea6a0d0bce462ab1e9cb38a14b1ac14b4148797c164212473852f5c0525161766b115b5a435fbfd673dbde8e14765 SHA512 2af250da696c4d0f613191e7a2e3084b2aa1dc995665a4164324cdb2cc56af7b000b8a2f5d5e7ac8ebbad3ae0ba4fc8eb641afe65c1a842a633c19e95ba3e65a
 DIST flowgrind-0.8.2.tar.bz2 264486 BLAKE2B f0135abad43066895ce9acfb0050d12a22054d03f59e48164cde0444b3677a7581e86f25a5a967279432c95a65811135a5ce28da0f041553bca6299aabd783fa SHA512 6d1395881f45fb04b2c73bc7e01cea6610795b58f59c297577c8f30942c81334e8e95cefb2331e5e40dc5f4df64a21307a94d471113251fd3127272cd081bb7b
-EBUILD flowgrind-0.8.0-r2.ebuild 858 BLAKE2B 1c009318c2cc1da1f7302c99293daf47d0d0dbaba8d3b28bf834ce4111ccfcc4bd15e25c6122c8e3c0bb6f43dfe865deba9e8256edc504a1072e28e35923d9e4 SHA512 3d5cf63b1393e44aded1fb03de87fc8e4203301dc5450e129a568e2d87d9a309a2023b571e1f7b718de876973905cd592059fb3e7943c2cdfc453307b1347bc7
-EBUILD flowgrind-0.8.2.ebuild 793 BLAKE2B b7a388a797adb67ade440d06d85487c2d8184c7c3a4845c8329e0be01919968268ed477a1ae7b0aadce336860c493faebc937df30524bede90c2ca6c6b849d3a SHA512 d82bbdac31b5ef1cb059f805d2c9b5ede8f17d926badd49d19a29d6ef6bf7587964316fbc6d939ce9f6a0278e18e0c916d243377c9d7ced29257e47be10be907
+EBUILD flowgrind-0.8.2.ebuild 783 BLAKE2B 351ab30347e016bb697cd9e68022f0e0dc75b5eebfbfc382be6fe062907530d057e7c0ec36eca03ec4636481851eb49c259e69be5f631181d5ba17feef341d9d SHA512 bd5c60e63a7158b9f93145c4872bf6c0cb063afdd2b14db979b178739c676b3a15d68d942998988c4c38e816828597036140f4776b0399dfd011d3e41536f36f
 MISC metadata.xml 473 BLAKE2B 4d0cdeb61e4d8eb2f19305f9daf9c63a997f10ba1325444b59a66141612bc8d4ec5469151ebda8ffd6af227037fec032e8f256cecfd826b832a34495e1002884 SHA512 b4e6e82bd5d4b4f54784184b81d87e4652579233bd351f65d55d02e34a93cce537267de17dc814726ffbc97bbde8d627234502ac6c1864ea944f0be563a056d9
diff --git a/net-analyzer/flowgrind/files/flowgrind-0.8.0-fno-common.patch b/net-analyzer/flowgrind/files/flowgrind-0.8.0-fno-common.patch
deleted file mode 100644
index 60835b858816..000000000000
--- a/net-analyzer/flowgrind/files/flowgrind-0.8.0-fno-common.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/src/daemon.c
-+++ b/src/daemon.c
-@@ -86,6 +86,10 @@
- 
- int daemon_pipe[2];
- 
-+pthread_t daemon_thread;
-+char *dump_prefix;
-+char *dump_dir;
-+
- pthread_mutex_t mutex;
- struct request *requests = 0, *requests_last = 0;
- 
---- a/src/daemon.h
-+++ b/src/daemon.h
-@@ -252,7 +252,7 @@
- 	int num_flows;
- };
- 
--pthread_t daemon_thread;
-+extern pthread_t daemon_thread;
- 
- /* Through this pipe we wakeup the thread from select */
- extern int daemon_pipe[2];
-@@ -268,9 +268,8 @@
-  * large a reply can get */
- struct report* get_reports(int *has_more);
- 
--/* FIXME: shouldn't be global? */
--char *dump_prefix;
--char *dump_dir;
-+extern char *dump_prefix;
-+extern char *dump_dir;
- 
- void *daemon_main(void* ptr);
- void add_report(struct report* report);
diff --git a/net-analyzer/flowgrind/flowgrind-0.8.0-r2.ebuild b/net-analyzer/flowgrind/flowgrind-0.8.0-r2.ebuild
deleted file mode 100644
index d8639d6fa32e..000000000000
--- a/net-analyzer/flowgrind/flowgrind-0.8.0-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Network performance measurement tool"
-HOMEPAGE="http://flowgrind.net/ https://github.com/flowgrind/flowgrind/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc gsl pcap"
-
-RDEPEND="
-	dev-libs/xmlrpc-c:=[abyss,curl]
-	sys-apps/util-linux
-	gsl? ( sci-libs/gsl:= )
-	pcap? ( net-libs/libpcap )
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	doc? ( app-doc/doxygen )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.0-fno-common.patch
-)
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_with doc doxygen) \
-		$(use_with gsl) \
-		$(use_with pcap)
-}
-
-src_compile() {
-	default
-
-	use doc && emake html
-}
-
-src_install() {
-	default
-
-	use doc && dodoc -r doc/html
-}
diff --git a/net-analyzer/flowgrind/flowgrind-0.8.2.ebuild b/net-analyzer/flowgrind/flowgrind-0.8.2.ebuild
index 6560928a5f0d..b49cce5aa66e 100644
--- a/net-analyzer/flowgrind/flowgrind-0.8.2.ebuild
+++ b/net-analyzer/flowgrind/flowgrind-0.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug doc gsl pcap"
+IUSE="doc gsl pcap"
 
 RDEPEND="dev-libs/xmlrpc-c:=[abyss,curl]
 	sys-apps/util-linux
@@ -21,7 +21,7 @@ BDEPEND="doc? ( app-doc/doxygen )"
 
 src_configure() {
 	econf \
-		$(use_enable debug) \
+		--disable-debug \
 		$(use_with doc doxygen) \
 		$(use_with gsl) \
 		$(use_with pcap)