Remove CVS header from patch. Fix building against sys-libs/ncurses[tinfo].

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

4 files changed, 30 insertions, 12 deletions

diff --git a/net-analyzer/jnettop/ChangeLog b/net-analyzer/jnettop/ChangeLog
index f5b15f60f70c..f9e51be1ff5a 100644
--- a/net-analyzer/jnettop/ChangeLog
+++ b/net-analyzer/jnettop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/jnettop
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/jnettop/ChangeLog,v 1.27 2012/10/30 17:04:06 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/jnettop/ChangeLog,v 1.28 2014/07/12 18:42:15 jer Exp $
+
+  12 Jul 2014; Jeroen Roovers <jer@gentoo.org> jnettop-0.13.0-r1.ebuild,
+  files/jnettop-0.13.0-asneeded.patch, +files/jnettop-0.13.0-tinfo.patch:
+  Remove CVS header from patch. Fix building against sys-libs/ncurses[tinfo].
 
   30 Oct 2012; Agostino Sarubbo <ago@gentoo.org> jnettop-0.13.0-r1.ebuild:
   Stable for amd64, wrt bug #439748
diff --git a/net-analyzer/jnettop/files/jnettop-0.13.0-asneeded.patch b/net-analyzer/jnettop/files/jnettop-0.13.0-asneeded.patch
index dc648f5fc1e0..8a43240bb0de 100644
--- a/net-analyzer/jnettop/files/jnettop-0.13.0-asneeded.patch
+++ b/net-analyzer/jnettop/files/jnettop-0.13.0-asneeded.patch
@@ -1,8 +1,7 @@
-diff -ur a/Makefile.am b/Makefile.am
---- a/Makefile.am	2006-04-14 11:32:14.000000000 -0500
-+++ b/Makefile.am	2009-02-12 22:44:49.000000000 -0600
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -1,8 +1,7 @@
- # $Header: /var/cvsroot/gentoo-x86/net-analyzer/jnettop/files/jnettop-0.13.0-asneeded.patch,v 1.1 2009/06/02 11:55:37 flameeyes Exp $
+
  
  INCLUDES = -I$(top_srcdir)/include @GLIB_CFLAGS@
 -AM_LDFLAGS = @GLIB_LIBS@ @NSL_LIBS@ @SOCKET_LIBS@
diff --git a/net-analyzer/jnettop/files/jnettop-0.13.0-tinfo.patch b/net-analyzer/jnettop/files/jnettop-0.13.0-tinfo.patch
new file mode 100644
index 000000000000..958685cb5c12
--- /dev/null
+++ b/net-analyzer/jnettop/files/jnettop-0.13.0-tinfo.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -15,6 +15,8 @@
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS([arpa/inet.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/sockio.h])
+ 
++PKG_CHECK_MODULES(ncurses,ncurses,[LIBS="$LIBS $ncurses_LIBS"],)
++
+ # with definitions
+ AC_ARG_WITH([ncurses],
+ 	AC_HELP_STRING([--without-ncurses], [don't use ncurses, default is YES when available]),
diff --git a/net-analyzer/jnettop/jnettop-0.13.0-r1.ebuild b/net-analyzer/jnettop/jnettop-0.13.0-r1.ebuild
index a36a66b611f4..041248d5f33d 100644
--- a/net-analyzer/jnettop/jnettop-0.13.0-r1.ebuild
+++ b/net-analyzer/jnettop/jnettop-0.13.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/jnettop/jnettop-0.13.0-r1.ebuild,v 1.9 2012/10/30 17:04:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/jnettop/jnettop-0.13.0-r1.ebuild,v 1.10 2014/07/12 18:42:15 jer Exp $
 
-EAPI=4
+EAPI=5
 inherit autotools eutils
 
 DESCRIPTION="A top like console network traffic visualiser"
@@ -14,11 +14,13 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="berkdb ncurses syslog"
 
-RDEPEND="net-libs/libpcap
+RDEPEND="
+	net-libs/libpcap
 	>=dev-libs/glib-2.0.1
 	berkdb? ( =sys-libs/db-4* )
 	ncurses? ( sys-libs/ncurses )
-	syslog? ( virtual/logger )"
+	syslog? ( virtual/logger )
+"
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
@@ -26,7 +28,9 @@ DEPEND="${RDEPEND}
 DOCS=( AUTHORS ChangeLog NEWS README )
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-asneeded.patch"
+	epatch \
+		"${FILESDIR}/${P}-asneeded.patch" \
+		"${FILESDIR}/${P}-tinfo.patch"
 	eautoreconf
 }