Fix building against sys-libs/ncurses[tinfo]. Combine sed changes into one patch.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A792A613)

3 files changed, 82 insertions, 2 deletions

diff --git a/net-analyzer/nethogs/ChangeLog b/net-analyzer/nethogs/ChangeLog
index 673e8a7e26b3..3c16a8bd16e8 100644
--- a/net-analyzer/nethogs/ChangeLog
+++ b/net-analyzer/nethogs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/nethogs
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nethogs/ChangeLog,v 1.22 2012/01/28 18:09:31 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nethogs/ChangeLog,v 1.23 2014/02/17 00:44:37 jer Exp $
+
+*nethogs-0.8.0-r3 (17 Feb 2014)
+
+  17 Feb 2014; Jeroen Roovers <jer@gentoo.org> +nethogs-0.8.0-r3.ebuild,
+  +files/nethogs-0.8.0-gentoo.patch:
+  Fix building against sys-libs/ncurses[tinfo]. Combine sed changes into one
+  patch.
 
   28 Jan 2012; Jeroen Roovers <jer@gentoo.org> -nethogs-0.6.1_pre2.ebuild,
   -files/nethogs-0.6.1_pre2-gcc43.patch, -nethogs-0.7.0.ebuild,
diff --git a/net-analyzer/nethogs/files/nethogs-0.8.0-gentoo.patch b/net-analyzer/nethogs/files/nethogs-0.8.0-gentoo.patch
new file mode 100644
index 000000000000..f1f1ceda7487
--- /dev/null
+++ b/net-analyzer/nethogs/files/nethogs-0.8.0-gentoo.patch
@@ -0,0 +1,40 @@
+--- a/Makefile
++++ b/Makefile
+@@ -5,15 +5,17 @@
+ #DESTDIR := /usr
+ DESTDIR := /usr/local
+ 
+-sbin  := $(DESTDIR)/sbin
+-man8 := $(DESTDIR)/share/man/man8/
++sbin  := $(DESTDIR)/usr/sbin
++man8 := $(DESTDIR)/usr/share/man/man8/
+ 
+ all: nethogs decpcap_test
+ # nethogs_testsum
+ 
+-CFLAGS=-g -Wall -Wextra
+-#CFLAGS=-O2
++CFLAGS+= -Wall -Wextra
+ OBJS=packet.o connection.o process.o refresh.o decpcap.o cui.o inode2prog.o conninode.o devices.o
++
++LIBS = $(shell $(PKG_CONFIG) --libs ncurses)
++
+ .PHONY: tgz
+ 
+ tgz: clean
+@@ -30,12 +32,12 @@
+ 	install -m 644 nethogs.8 $(man8)
+ 
+ nethogs: nethogs.cpp $(OBJS)
+-	$(CXX) $(CFLAGS) nethogs.cpp $(OBJS) -o nethogs -lpcap -lm -lncurses -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\"
++	$(CXX) $(CFLAGS) $(LDFLAGS) nethogs.cpp $(OBJS) -o nethogs -lpcap -lm $(LIBS) -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\"
+ nethogs_testsum: nethogs_testsum.cpp $(OBJS)
+-	$(CXX) $(CFLAGS) -g nethogs_testsum.cpp $(OBJS) -o nethogs_testsum -lpcap -lm -lncurses -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\"
++	$(CXX) $(CFLAGS) $(LDFLAGS) -g nethogs_testsum.cpp $(OBJS) -o nethogs_testsum -lpcap -lm $(LIBS) -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\"
+ 
+ decpcap_test: decpcap_test.cpp decpcap.o
+-	$(CXX) $(CFLAGS) decpcap_test.cpp decpcap.o -o decpcap_test -lpcap -lm
++	$(CXX) $(CFLAGS) $(LDFLAGS) decpcap_test.cpp decpcap.o -o decpcap_test -lpcap -lm
+ 
+ #-lefence
+ 
diff --git a/net-analyzer/nethogs/nethogs-0.8.0-r3.ebuild b/net-analyzer/nethogs/nethogs-0.8.0-r3.ebuild
new file mode 100644
index 000000000000..95889cf25968
--- /dev/null
+++ b/net-analyzer/nethogs/nethogs-0.8.0-r3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nethogs/nethogs-0.8.0-r3.ebuild,v 1.1 2014/02/17 00:44:37 jer Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A small 'net top' tool, grouping bandwidth by process"
+HOMEPAGE="http://nethogs.sf.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+
+RDEPEND="
+	net-libs/libpcap
+	sys-libs/ncurses
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=( Changelog DESIGN README )
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	tc-export CC CXX PKG_CONFIG
+}