summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2014-02-17 01:10:26 +0000
committerJeroen Roovers <jer@gentoo.org>2014-02-17 01:10:26 +0000
commitcfcd0d8d2107429b07c9c397ecba3d565a626329 (patch)
treecbe6ee916606d67ee1520451ea4fdf2b8176fe0c /net-analyzer
parentUse pkg-config cross-compile friendly. (diff)
downloadgentoo-2-cfcd0d8d2107429b07c9c397ecba3d565a626329.tar.gz
gentoo-2-cfcd0d8d2107429b07c9c397ecba3d565a626329.tar.bz2
gentoo-2-cfcd0d8d2107429b07c9c397ecba3d565a626329.zip
Clean up patch. Remove unneeded sed script.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/iftop/ChangeLog6
-rw-r--r--net-analyzer/iftop/files/iftop-1.0_pre4-tinfo.patch7
-rw-r--r--net-analyzer/iftop/iftop-1.0_pre4.ebuild3
3 files changed, 6 insertions, 10 deletions
diff --git a/net-analyzer/iftop/ChangeLog b/net-analyzer/iftop/ChangeLog
index 08d8b75a91f2..36a599dc5ba6 100644
--- a/net-analyzer/iftop/ChangeLog
+++ b/net-analyzer/iftop/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-analyzer/iftop
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iftop/ChangeLog,v 1.59 2014/01/20 14:26:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iftop/ChangeLog,v 1.60 2014/02/17 01:10:25 jer Exp $
+
+ 17 Feb 2014; Jeroen Roovers <jer@gentoo.org> iftop-1.0_pre4.ebuild,
+ files/iftop-1.0_pre4-tinfo.patch:
+ Clean up patch. Remove unneeded sed script.
*iftop-1.0_pre4 (20 Jan 2014)
diff --git a/net-analyzer/iftop/files/iftop-1.0_pre4-tinfo.patch b/net-analyzer/iftop/files/iftop-1.0_pre4-tinfo.patch
index 3e407784c3f2..6542d68b7ed9 100644
--- a/net-analyzer/iftop/files/iftop-1.0_pre4-tinfo.patch
+++ b/net-analyzer/iftop/files/iftop-1.0_pre4-tinfo.patch
@@ -1,9 +1,4 @@
- Makefile.am | 2 +-
- configure.ac | 18 +++++++++++-------
- 2 files changed, 12 insertions(+), 8 deletions(-)
-
diff --git a/Makefile.am b/Makefile.am
-index 1a9320c..a9bd7f1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,7 @@ iftop_SOURCES = addr_hash.c edline.c hash.c iftop.c ns_hash.c \
@@ -15,8 +10,6 @@ index 1a9320c..a9bd7f1 100644
noinst_HEADERS = addr_hash.h ether.h ethertype.h extract.h hash.h iftop.h \
integers.h ip.h llc.h ns_hash.h options.h resolver.h \
-diff --git a/configure.ac b/configure.ac
-index 671241e..83352c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -348,19 +348,23 @@ dnl a solid chance that mvchgat is a macro, so we can't just use
diff --git a/net-analyzer/iftop/iftop-1.0_pre4.ebuild b/net-analyzer/iftop/iftop-1.0_pre4.ebuild
index 57cf1b465e3e..9e161e778ea0 100644
--- a/net-analyzer/iftop/iftop-1.0_pre4.ebuild
+++ b/net-analyzer/iftop/iftop-1.0_pre4.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/iftop/iftop-1.0_pre4.ebuild,v 1.1 2014/01/20 14:22:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iftop/iftop-1.0_pre4.ebuild,v 1.2 2014/02/17 01:10:25 jer Exp $
EAPI=5
@@ -27,7 +27,6 @@ S="${WORKDIR}"/${P/_/}
src_prepare() {
epatch "${FILESDIR}"/${P}-tinfo.patch
- sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
# bug 490168
cat "${FILESDIR}"/ax_pthread.m4 >> "${S}"/acinclude.m4 || die