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

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

5 files changed, 44 insertions, 15 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/Manifest b/net-analyzer/jnettop/Manifest
index 572603b41599..6ee07f796b18 100644
--- a/net-analyzer/jnettop/Manifest
+++ b/net-analyzer/jnettop/Manifest
@@ -1,5 +1,16 @@
-AUX jnettop-0.13.0-asneeded.patch 496 SHA256 f1b7cc63da40d56d1d5db26a6907fa138b583edd87c60771d40ed421790390bf SHA512 da65d25d8f5696becfedd6a18e52431fcfd5d435626b6b445125d07a0b52590f795da0be2a4abe01ab6f2fff161dfea72fac2b1d6e7568a75facf4c82bacb48b WHIRLPOOL c2edb57749ad77bd5b9e2eb90190a6376bdc2d07650e2454601f2f34b77f74c1e1e10291cba6bff5dff242f85e09f302b5d7638b98ac32b1921e1697103d1d5d
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX jnettop-0.13.0-asneeded.patch 253 SHA256 a4b523b4779674ffe1816f873801cb085ada0d2da20ca5c5bbea1c493a16cc5e SHA512 68084c207c6154a86bb65913c523264ceb83e349d21de9ed7184aafaa21f63d9739154b69fd3f55023d89947ae70727dbdecd6dc8483854f1f2e5bc5565b52e7 WHIRLPOOL 8b13bdacf11bad12d09bbb3451095f1955550116ea08bd3133ab4974fb1b02fa3bf75326c2c9cd3d1c22104f9d69499f0a4d8f1b7ffcb1250ed34ea7e3d14f16
+AUX jnettop-0.13.0-tinfo.patch 375 SHA256 e24a83df4cb609a8d2ce422c9d920ffe8d7c468f9dc9366481c8a5b3008af055 SHA512 07f6ad5cf44648925d64277f2e74d4a70c1770d192a7b6e6f39c1fc3e28748de1e959cb95d841a9a3b0afee337bb1a8a6c342a698115c44ad76969cf6c095189 WHIRLPOOL 0ea4876ee27b2e017e0b0ae99be9425210605f88802c4714bc86a552f209d924f12ab4776c698db24c5401d11b38814abe2d5afd2e342b7f825e6574a977e4c6
 DIST jnettop-0.13.0.tar.gz 131009 SHA256 e987a1a9325595c8a0543ab61cf3b6d781b4faf72dd0e0e0c70b2cc2ceb5a5a0 SHA512 304293cd011ce8556aabf69e91b2e831ac61aa43016bb5b616d24b45805315a815dfba37dfe9f7cd3c637931043d4123b2f46a7637ba1a0b9d30267fe6dcb051 WHIRLPOOL 9e4c2226f40b6ee95905e51f0f4d2b70e4a0aeea40ca9fbb3cc0ba696c673d4fb95aecbe5757857e49533b7628bd8cdf5c27cc568fbcd34167fe40fca52b961f
-EBUILD jnettop-0.13.0-r1.ebuild 976 SHA256 1d6c3fce4292af4785cde6c6d3b90af15f1599b52ca31256a19ebb298b9ab659 SHA512 2d804308602638db1ba58f7c6a22a07a6fa90a7ae1f192d59a5e2d09e63dd64ce24bdefbaaed0dc536682fca1106dd7356694af1805c50af23be960ed2fab9e6 WHIRLPOOL 6e6f89057c43a63983e628640d017a6b2e367d954f841b1fb34c3995d0f20701d976d5a43f428b312347c107765f0ca884e9f9e715dfad8510dfeda98454c0e2
-MISC ChangeLog 3628 SHA256 701ee6942e4d765e87c623939f51983c24382596fc4469c7924ff5f0ba311a19 SHA512 3bba0e6c9405639d49bcbdba403fb166bc8ed7fe31dbfb0c2c93ee1b886e12bb798b0e5fd9c1a9a7521452537bbf643c5d5ca85a4aa2456315c15c5b4bcebf25 WHIRLPOOL 18dd6b1f28b275fba95f64542fd1727b018124b300ac3b57fbc69a4fce78ad129441f7fbdc989fa6f1094fee2a7e5316ffb65e19dbca8b1669c7d961da49cdac
+EBUILD jnettop-0.13.0-r1.ebuild 1019 SHA256 1d6077b753465f3fc8aa18b57ac229e6bc82be36793de53068bcfe996d25b4b8 SHA512 161621dbf7bd2c39b531fade73276606b0d5bc5090e4a4427c63c3a5e7284418c6f99c7b4eaf4d6a086a0995df925baa431ea9cea553d2d4c48f37f24e9f8dce WHIRLPOOL 42357cd6435307cd75bb504575dbad1850568c425dfb27c5a546167ab1b9100e9b9571b291baeb9cd795dab38248ecf65ea1d683a39ea7349b7207e25cc7d899
+MISC ChangeLog 3854 SHA256 2dda129193618a600a30d206199856404f6f2bc1b49f12bb87aa34faf42c2c17 SHA512 0c7917ec0efd20cf6704256284c925152c0d121e21c84600df3b7bbba01b4603c5238c6d2b5cf8705c3b75a87a50f13c75342ab952c7e0351fbac48fa52f8b2e WHIRLPOOL 873c49be91f0c4d46fb6b197ba671416ca416ee59794d22d5e5689c27bce75372e17cebee2bba9d4a7c7ffa1d5d9e1eb5578db5a0b61a23386b25ce17f7af8b8
 MISC metadata.xml 240 SHA256 708da94aea60e308d7b14137f96d1d76949cf66841fe1b329b53fcc1fbe7439c SHA512 7d62368cc74abf474ef6fd4f2ae5f1048ed371a67729aa112dc6ca4775e1117f070ee21fb0a5ae14f72396b679488b359d7784433fefe45e7e37b7537ff7af35 WHIRLPOOL ea02cb6716da87c3fac086d3bf088eb1d4c801a0d98522abdc9e1bccc950185e615888514f104dbf5c0a095dfc8e706ae44a17e3b10ffcdc584512a348f47eea
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlPBgYkACgkQVWmRsqeSphMCJACfXQithUw1M1TK0vlOmPAtNGGv
+CRQAn25UfAMHANC2KfQh1ed46ZuG2VLB
+=eFz7
+-----END PGP SIGNATURE-----
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
 }