From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 962FC1382C5 for ; Mon, 15 Mar 2021 21:09:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E7E42E0849; Mon, 15 Mar 2021 21:09:30 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C3DA5E0849 for ; Mon, 15 Mar 2021 21:09:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B5F09340E24 for ; Mon, 15 Mar 2021 21:09:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 50867597 for ; Mon, 15 Mar 2021 21:09:27 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1615842468.2659a2ff712045c570ac63c53e8909b9c922f53e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nfdump/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/nfdump/nfdump-1.6.21-r1.ebuild net-analyzer/nfdump/nfdump-1.6.22-r1.ebuild net-analyzer/nfdump/nfdump-1.6.22.ebuild X-VCS-Directories: net-analyzer/nfdump/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 2659a2ff712045c570ac63c53e8909b9c922f53e X-VCS-Branch: master Date: Mon, 15 Mar 2021 21:09:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f9f4de92-77ca-4827-9709-a09fe9d37c0a X-Archives-Hash: cedea47cc66da6f8ed8c27dc5cad7838 commit: 2659a2ff712045c570ac63c53e8909b9c922f53e Author: Sam James gentoo org> AuthorDate: Mon Mar 15 21:03:55 2021 +0000 Commit: Sam James gentoo 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 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 -}