[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nfdump/

["Sam James" <sam@gentoo.org>]

commit:     2659a2ff712045c570ac63c53e8909b9c922f53e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 15 21:03:55 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 15 21:07:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2659a2ff

net-analyzer/nfdump: merge nfcapd changes into 1.6.22-r1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...mp-1.6.21-r1.ebuild => nfdump-1.6.22-r1.ebuild} | 24 ++++----
 net-analyzer/nfdump/nfdump-1.6.22.ebuild           | 69 ----------------------
 2 files changed, 13 insertions(+), 80 deletions(-)

diff --git a/net-analyzer/nfdump/nfdump-1.6.21-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.22-r1.ebuild
similarity index 85%
rename from net-analyzer/nfdump/nfdump-1.6.21-r1.ebuild
rename to net-analyzer/nfdump/nfdump-1.6.22-r1.ebuild
index 4b780ec598c..67db7020134 100644
--- a/net-analyzer/nfdump/nfdump-1.6.21-r1.ebuild
+++ b/net-analyzer/nfdump/nfdump-1.6.22-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools
 
 DESCRIPTION="A set of tools to collect and process netflow data"
@@ -9,13 +10,13 @@ HOMEPAGE="https://github.com/phaag/nfdump"
 SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="0/1.6.15"
+SLOT="0/1.6.22"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug doc jnat ftconv nfpcapd nfprofile nftrack nsel readpcap sflow
 	static-libs"
 REQUIRED_USE="?? ( jnat nsel )"
 
-COMMON_DEPEND="
+RDEPEND="
 	app-arch/bzip2
 	sys-libs/zlib
 	ftconv? ( net-analyzer/flow-tools )
@@ -24,20 +25,21 @@ COMMON_DEPEND="
 	nftrack? ( net-analyzer/rrdtool )
 	readpcap? ( net-libs/libpcap )
 "
-DEPEND="
-	${COMMON_DEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-devel/flex
 	virtual/yacc
-	doc? ( app-doc/doxygen media-gfx/graphviz )
-"
-RDEPEND="
-	${COMMON_DEPEND}
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
 "
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.6.19-compiler.patch
 	"${FILESDIR}"/${PN}-1.6.19-libft.patch
-	"${FILESDIR}"/${PN}-1.6.21-remove-strict-rfc-7011-handling.patch
 )
+
 DOCS=( AUTHORS ChangeLog README.md )
 
 src_prepare() {
@@ -62,7 +64,7 @@ src_configure() {
 		$(use_enable nsel) \
 		$(use_enable readpcap) \
 		$(use_enable sflow) \
-		$(use_enable static-libs static)
+		--disable-static
 }
 
 src_install() {

diff --git a/net-analyzer/nfdump/nfdump-1.6.22.ebuild b/net-analyzer/nfdump/nfdump-1.6.22.ebuild
deleted file mode 100644
index 223ae9b017c..00000000000
--- a/net-analyzer/nfdump/nfdump-1.6.22.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A set of tools to collect and process netflow data"
-HOMEPAGE="https://github.com/phaag/nfdump"
-SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/1.6.22"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc ftconv nfprofile nftrack readpcap sflow"
-
-DEPEND="
-	app-arch/bzip2
-	sys-libs/zlib
-	ftconv? ( net-analyzer/flow-tools )
-	nfprofile? ( net-analyzer/rrdtool )
-	nftrack? ( net-analyzer/rrdtool )
-	readpcap? ( net-libs/libpcap )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	sys-devel/flex
-	virtual/yacc
-	doc? ( app-doc/doxygen )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.19-compiler.patch
-	"${FILESDIR}"/${PN}-1.6.19-libft.patch
-)
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	if use doc; then
-		doxygen -u doc/Doxyfile.in || die
-	fi
-}
-
-src_configure() {
-	# --without-ftconf is not handled well #322201
-	econf \
-		$(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \
-		$(use nfprofile && echo --enable-nfprofile) \
-		$(use nftrack && echo --enable-nftrack) \
-		$(use_enable debug devel) \
-		$(use_enable readpcap) \
-		$(use_enable sflow) \
-		--disable-static
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-
-	if use doc; then
-		dodoc -r doc/html
-	fi
-}