Remove redundant minilzo and failing and redundant sed scripts.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 11 insertions, 17 deletions

diff --git a/net-analyzer/nfdump/ChangeLog b/net-analyzer/nfdump/ChangeLog
index 48e535dd7bc2..642db0781524 100644
--- a/net-analyzer/nfdump/ChangeLog
+++ b/net-analyzer/nfdump/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/nfdump
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.41 2014/12/04 10:01:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.42 2014/12/04 10:15:19 jer Exp $
+
+  04 Dec 2014; Jeroen Roovers <jer@gentoo.org> nfdump-1.6.13.ebuild:
+  Remove redundant minilzo and failing and redundant sed scripts.
 
 *nfdump-1.6.13 (04 Dec 2014)
 
diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index 70a0ebf25986..0853273d132a 100644
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -7,13 +7,13 @@ DIST minilzo-2.07.tar.gz 60009 SHA256 b706cf02e8af2716a56830ca067cf2d7c0e305c776
 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
 EBUILD nfdump-1.6.12.ebuild 1647 SHA256 e0d519e0a498d43a0f64d9a93bedbfe6c0c6b78c34a5ab536e46704e8536d749 SHA512 b929cc8e13a6cc7f63494f8220c3027806f3e74b1d2f88b3fc12cfae2e55a384bf4c571d65c01189a7d4d3f6497a2b3a8d86b7ed9adce2713b33f9e29a45b567 WHIRLPOOL f391ab0488d1e93f03075fd48a65e0350c42723908df4ce1a3976d466730e53cdec5cd0d24bde34eba2a1c4fc5000645e3f83b0c52770c8c2381041757b94835
-EBUILD nfdump-1.6.13.ebuild 1663 SHA256 2ad397b0e665e3cdcac2445a59343068103c300381cbff1eaf060516c4f1fdcd SHA512 7ca8f62a961492e5ce9ede84f0b2acc6ccfaed428f11b5acd0c9a179b0f064b7ac7bc8e16241e16b87086c10528350188cdfc3ad9b3b27122362b30c7e23a550 WHIRLPOOL c3b83caf7480bf05bdddc5891a0c762dce887bcd7c3a6a3be3b21e7420a4d8d96a49a996fa421c9cbe383a5cae51acc55c2b160361902f67b1a3a8bc8ce8a02d
-MISC ChangeLog 5848 SHA256 7c43342be790f71e192efd90d511d915817b56cb45caaa7a94f47119f0e808a0 SHA512 879fcbebed83ca6c267b97d8ac22f8c67b8c9753fa42acf2cb28ddbbeebf654329c393cd6759d5e0a5d8b87bc3454d4d7174ff57f4ae48cf21c80575cdaa6fc9 WHIRLPOOL d913e8cada413a928bd4998c877dd9181cad3acb833cbccbfbab2f74325bed58a5f91efe9c5b5700fb0df1f52ef267006af66cf90855294df568a936c9f857a2
+EBUILD nfdump-1.6.13.ebuild 1344 SHA256 e9a83ba7ce20f4b7214394e31051c909bb7611111d92abd714759043e610a2e7 SHA512 eb039707eb4b704517ac1bec56f14468fce5f3170c6c94402f21a899b1c260f62ca4a1156b2447ca92c73b3feac00c2db28fca939b8707a68485951efdc903f6 WHIRLPOOL 18d47ad8edab471f3e2455f96a1e78248b2101392657184b9133f4f3d97e35961ad11e2cc79c0bd1fbd6e303ca9d3fa6e84621e45d2b204cebeff11b6fbdf2a5
+MISC ChangeLog 5984 SHA256 422799f211c29595bfec831b53e8e7677aac8c9a0583a2813ece39e6eb1c1335 SHA512 f32e1ac23824b9eecb22021b1b6b82d1a88da868ad01ccaaf04890a6aafa63adab197323c0a2a56945d7ec39901b10f5a34ca62cbf4140c83f20293b212aab0d WHIRLPOOL 026ea9e368308b0d29f448a3b51ef80b3f4e8e7136b29d63de004a18f9aafe18039a32f457de95eb1179aded3cda98c4c126d3bceb10b294fac5277a1736b8b0
 MISC metadata.xml 731 SHA256 3bb173957579a6070cd6eb51731f2f196314e0d4b83e989425ad3af4f4d4b027 SHA512 a85786a81254c27b0823055a15c8c8d12722aaca35329f9072da15da0d48eb0f528f37a25241f1095b7fb2aec16f67a4be3f06cfba6e78b5860da34fb044329f WHIRLPOOL ce811c0eac09ae59766d098362b129ec880044bbba6f540cc560c882f4bab1c147fe1b2ba48f6a0b38a437a2de704eb8b0164587817aefad2adc46362ca2766e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSAMQYACgkQVWmRsqeSphN59wCfWC8VkWtB5VhmNmWYE3Eqgb2o
-OCEAn0tUGcvsbSZ7WxDLy9SFAft7KL/V
-=VSnQ
+iEYEAREIAAYFAlSANDgACgkQVWmRsqeSphNwTgCfdZ1dLy/RqOO2+H4t9Ph+4MoU
+uswAnAmYyJUPgu9Rpyhk9ysTOpD11F3y
+=VlBf
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nfdump/nfdump-1.6.13.ebuild b/net-analyzer/nfdump/nfdump-1.6.13.ebuild
index 70e00496b234..0c77822d8cd5 100644
--- a/net-analyzer/nfdump/nfdump-1.6.13.ebuild
+++ b/net-analyzer/nfdump/nfdump-1.6.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.13.ebuild,v 1.1 2014/12/04 10:01:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.13.ebuild,v 1.2 2014/12/04 10:15:19 jer Exp $
 
 EAPI=5
 inherit autotools eutils
@@ -10,7 +10,6 @@ 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"
@@ -40,17 +39,9 @@ S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-libft.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
 }