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

["Jeroen Roovers" <jer@gentoo.org>]

commit:     4c9c3d4f0266be323810007f6999c50adf346a61
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun May 15 06:57:43 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun May 15 06:57:43 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c9c3d4f

net-analyzer/nfdump: Old.

Package-Manager: portage-2.2.28

 net-analyzer/nfdump/Manifest                       |  3 -
 .../nfdump/files/nfdump-1.6.12-test-dep.patch      | 11 ----
 .../nfdump/files/nfdump-1.6.13-libft.patch         | 14 -----
 net-analyzer/nfdump/nfdump-1.6.12.ebuild           | 68 ----------------------
 net-analyzer/nfdump/nfdump-1.6.13.ebuild           | 58 ------------------
 5 files changed, 154 deletions(-)

diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index 68f8d06..cd15608 100644
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -1,5 +1,2 @@
 DIST ff0e855bd1f51bed9fc5d8559c64d3cfb475a5d8.patch 31579 SHA256 39d1f37abee626863ad589439235d4e182eb9faf90bcbd0a75582aacee63a185 SHA512 ee3b82f1283f3dceb36cf60abcee7f5a8fb6c8fe257e2233c3fbb9a34b3c5608dfa101fd473c8b839356a9d1c294a37b9e65657ff1b2d5c015015ff90b2d2c97 WHIRLPOOL 0f074599b318ab7fc4e7444d17e9ab2f7adb3834e4ddd16ad2af06a343e4df2dd402afc87a1d6d3d743af116055c1e59dc8953f2de32742f1afd856eefe0cb69
-DIST minilzo-2.07.tar.gz 60009 SHA256 b706cf02e8af2716a56830ca067cf2d7c0e305c776cb26bd760cd157ce73c928 SHA512 ff1604ab6e273208aa72218367c7acd6f262965ee8fa62091346851099df237af9e9fe61c29638b922ce020d5d6463a18b93a899299c0d96745135aad839c816 WHIRLPOOL 66ec8d7a87a75e218f052a30fc7afcd05f906a91641b85b83bcda79356819c390a71ceb9d71f1015e82791e1bd62f4f69cce68f3e4250dd6323a7a7d47b3c72a
-DIST nfdump-1.6.12.tar.gz 733604 SHA256 4b597c3c948b2ac1a4b0b11ffbdc5c8bab8835f14718ad0f7896daeaf7b89204 SHA512 4ff61c14746f34f47588545e58e4e2fa679cc107192cb81d4ece1b7e18ad9ae1d3ce7663b90a302a64a3cc72cdd55718a446c5323ac100ed5fc3601931d866ad WHIRLPOOL 7acbc624868802e73f1d67f0984bdbfd67e9c3d14679fde360be7fefbeeac18d884930802abb156b2a283796f690588c4a46bc12a3287f791b9c6e87f04b02ed
-DIST nfdump-1.6.13.tar.gz 662006 SHA256 251533c316c9fe595312f477cdb051e9c667517f49fb7ac5b432495730e45693 SHA512 92c21462cddc69b3551d0ed5c20c7b87e5b4e6438efcbc16aac0e8af45b8ec7e5a361c6e514effcf78c1e78fd892959e8f39bb08915d4daedf4b6e932303688d WHIRLPOOL a412164ff29d9e7a2864033a320ecc60789138097fb3c237b413a953cb7136330a0989f5402ac74c2261c6279675eea3bbf1450b4c6c03475e8ad2fe97cafefd
 DIST nfdump-1.6.14.tar.gz 1834355 SHA256 7bf1b17cdcf81c399c6aaf87e0a8cbe12d81a9e33831629eb3a792878d5f80b1 SHA512 c5e5540526dfce3798728930576e4c7930c3ff80893a94d7f9e65c7c577d1e78bdc47a99c47cee837327ad202197afc378d2408b1b9b847044d0110146055ffe WHIRLPOOL ac7929fdc76b2980a464e1253e24832ad8abc153917d5290655a7fd5b29562b769f1120b29960624b5f73aa16bfab0593efb051af350ba3aacfed3aeeee1bb00

diff --git a/net-analyzer/nfdump/files/nfdump-1.6.12-test-dep.patch b/net-analyzer/nfdump/files/nfdump-1.6.12-test-dep.patch
deleted file mode 100644
index 312809a..0000000
--- a/net-analyzer/nfdump/files/nfdump-1.6.12-test-dep.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/bin/Makefile.am
-+++ b/bin/Makefile.am
-@@ -5,6 +5,8 @@
- check_PROGRAMMS = test.sh
- TESTS = nftest test.sh
- 
-+test.sh: nfgen
-+
- if SFLOW
- bin_PROGRAMS += sfcapd
- endif

diff --git a/net-analyzer/nfdump/files/nfdump-1.6.13-libft.patch b/net-analyzer/nfdump/files/nfdump-1.6.13-libft.patch
deleted file mode 100644
index f657150..0000000
--- a/net-analyzer/nfdump/files/nfdump-1.6.13-libft.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -109,9 +109,8 @@
- 	if test ! -f "$WHERE_FTPATH/include/ftlib.h"; then
- 		AC_MSG_ERROR(ftlib.h file not found in flow-tools directory '$WHERE_FTPATH'. Use --with-ftpath=PATH)
- 	fi
--	if test ! -f "$WHERE_FTPATH/lib/libft.a"; then
--		AC_MSG_ERROR(libft.a not found in flow-tools directory '$WHERE_FTPATH'. Build flow tools first)
--	fi
-+	AC_CHECK_LIB([ft], [main],,
-+		AC_MSG_ERROR(libft not found in flow-tools directory '$WHERE_FTPATH'. Build flow tools first))
- 	FT_INCLUDES="-I$WHERE_FTPATH/include -I$WHERE_FTPATH/lib"
- 	FT_LDFLAGS="-L$WHERE_FTPATH/lib"
- else

diff --git a/net-analyzer/nfdump/nfdump-1.6.12.ebuild b/net-analyzer/nfdump/nfdump-1.6.12.ebuild
deleted file mode 100644
index b26d8d2..0000000
--- a/net-analyzer/nfdump/nfdump-1.6.12.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils
-
-MY_P="${P/_/}"
-DESCRIPTION="A set of tools to collect and process netflow data"
-HOMEPAGE="http://nfdump.sourceforge.net/"
-SRC_URI="
-	mirror://sourceforge/nfdump/${MY_P}.tar.gz
-	http://www.oberhumer.com/opensource/lzo/download/minilzo-2.07.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="compat15 debug ftconv nfprofile nftrack readpcap sflow"
-
-CDEPEND="
-	ftconv? ( sys-libs/zlib net-analyzer/flow-tools )
-	nfprofile? ( net-analyzer/rrdtool )
-	nftrack? ( net-analyzer/rrdtool )
-	readpcap? ( net-libs/libpcap )
-"
-DEPEND="
-	${CDEPEND}
-	sys-devel/flex
-	virtual/yacc
-"
-RDEPEND="
-	${CDEPEND}
-	dev-lang/perl
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-test-dep.patch
-
-	# bug #515278
-	cp "${WORKDIR}"/minilzo-2.07/*.{c,h} "${S}"/bin || die
-
-	if use ftconv; then
-		sed -e '/ftbuild.h/d' -i bin/ft2nfdump.c || die
-		sed \
-			-e 's:lib\(/ftlib.h\):include\1:' \
-			-e 's:libft.a:libft.so:' \
-			\-i configure.in || die
-	fi
-	sed -i bin/Makefile.am -e '/^AM_CFLAGS/d' || die
-	eautoreconf
-}
-
-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 compat15) \
-		$(use_enable debug devel) \
-		$(use_enable readpcap) \
-		$(use_enable sflow)
-}

diff --git a/net-analyzer/nfdump/nfdump-1.6.13.ebuild b/net-analyzer/nfdump/nfdump-1.6.13.ebuild
deleted file mode 100644
index 4e2f707..0000000
--- a/net-analyzer/nfdump/nfdump-1.6.13.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils
-
-MY_P="${P/_/}"
-DESCRIPTION="A set of tools to collect and process netflow data"
-HOMEPAGE="http://nfdump.sourceforge.net/"
-SRC_URI="
-	mirror://sourceforge/nfdump/${MY_P}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="compat15 debug ftconv nfprofile nftrack readpcap sflow"
-
-COMMON_DEPEND="
-	ftconv? ( sys-libs/zlib net-analyzer/flow-tools )
-	nfprofile? ( net-analyzer/rrdtool )
-	nftrack? ( net-analyzer/rrdtool )
-	readpcap? ( net-libs/libpcap )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	sys-devel/flex
-	virtual/yacc
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-lang/perl
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libft.patch
-
-	sed -i bin/Makefile.am -e '/^AM_CFLAGS/d' || die
-
-	eautoreconf
-}
-
-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 compat15) \
-		$(use_enable debug devel) \
-		$(use_enable readpcap) \
-		$(use_enable sflow)
-}