EAPI bump. Fix building against sys-libs/ncurses[tinfo]. Clean up patches. Remove short <longdescription>.

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

6 files changed, 105 insertions, 26 deletions

diff --git a/net-analyzer/trafshow/ChangeLog b/net-analyzer/trafshow/ChangeLog
index f11190c676ea..3cc1729ec66d 100644
--- a/net-analyzer/trafshow/ChangeLog
+++ b/net-analyzer/trafshow/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/trafshow
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/trafshow/ChangeLog,v 1.40 2012/12/05 16:47:32 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/trafshow/ChangeLog,v 1.41 2014/07/18 03:11:48 jer Exp $
+
+  18 Jul 2014; Jeroen Roovers <jer@gentoo.org> trafshow-5.2.3.ebuild,
+  files/trafshow-5.2.3-gcc44.patch, files/trafshow-5.2.3-gentoo.patch,
+  +files/trafshow-5.2.3-tinfo.patch, metadata.xml:
+  EAPI bump. Fix building against sys-libs/ncurses[tinfo]. Clean up patches.
+  Remove short <longdescription>.
 
   05 Dec 2012; Jeroen Roovers <jer@gentoo.org> trafshow-5.2.3.ebuild:
   Fix LICENSE by Ulrich Müller (bug #446068).
diff --git a/net-analyzer/trafshow/files/trafshow-5.2.3-gcc44.patch b/net-analyzer/trafshow/files/trafshow-5.2.3-gcc44.patch
index c9fdcc8b7ec3..02424fe1203a 100644
--- a/net-analyzer/trafshow/files/trafshow-5.2.3-gcc44.patch
+++ b/net-analyzer/trafshow/files/trafshow-5.2.3-gcc44.patch
@@ -1,6 +1,5 @@
-diff -ur trafshow-5.2.3.orig/session.c trafshow-5.2.3/session.c
---- trafshow-5.2.3.orig/session.c	2006-01-08 07:58:08.000000000 +0200
-+++ trafshow-5.2.3/session.c	2009-07-25 23:54:32.000000000 +0300
+--- a/session.c
++++ b/session.c
 @@ -40,7 +40,7 @@
  #define	ASYNC_MODE	FNDELAY
  #elif	O_ASYNC
diff --git a/net-analyzer/trafshow/files/trafshow-5.2.3-gentoo.patch b/net-analyzer/trafshow/files/trafshow-5.2.3-gentoo.patch
index 79c204e050ac..95d342a603a4 100644
--- a/net-analyzer/trafshow/files/trafshow-5.2.3-gentoo.patch
+++ b/net-analyzer/trafshow/files/trafshow-5.2.3-gentoo.patch
@@ -1,5 +1,5 @@
---- trafshow-5.2.3/Makefile.in.orig	2004-06-15 10:29:14.000000000 +0200
-+++ trafshow-5.2.3/Makefile.in	2009-01-15 06:49:41.000000000 +0100
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -73,9 +73,9 @@
  	@echo 'char compiled[] = "$(CC) $(CFLAGS) $(LIBS)";' >> $@
  
diff --git a/net-analyzer/trafshow/files/trafshow-5.2.3-tinfo.patch b/net-analyzer/trafshow/files/trafshow-5.2.3-tinfo.patch
new file mode 100644
index 000000000000..0fd4985794d8
--- /dev/null
+++ b/net-analyzer/trafshow/files/trafshow-5.2.3-tinfo.patch
@@ -0,0 +1,75 @@
+--- a/configure.in
++++ b/configure.in
+@@ -23,6 +23,9 @@
+ AC_PROG_CC
+ AC_PROG_YACC
+ AC_PROG_LEX
++
++PKG_PROG_PKG_CONFIG
++
+ AC_REQUIRE_CPP
+ AC_AIX
+ ACX_PTHREAD(, AC_MSG_ERROR(cannot find pthread; see the INSTALL notes))
+@@ -51,7 +54,7 @@
+ 	)
+ )
+ if test "$ac_cv_type_in_addr_t" != yes; then
+-	AC_DEFINE_UNQUOTED(in_addr_t, $ac_cv_type_in_addr_t)
++	AC_DEFINE_UNQUOTED([in_addr_t], [$ac_cv_type_in_addr_t], [addr_t])
+ fi
+ 
+ AC_CACHE_CHECK(for socklen_t, ac_cv_type_socklen_t,
+@@ -65,7 +68,7 @@
+ 	)
+ )
+ if test "$ac_cv_type_socklen_t" != yes; then
+-	AC_DEFINE_UNQUOTED(socklen_t, $ac_cv_type_socklen_t)
++	AC_DEFINE_UNQUOTED([socklen_t], [$ac_cv_type_socklen_t], [socklen_t])
+ fi
+ 
+ AC_CACHE_CHECK(for struct sockaddr_storage, ac_cv_sockaddr_storage,
+@@ -79,7 +82,7 @@
+ 	)
+ )
+ if test "$ac_cv_sockaddr_storage" != no; then
+-	AC_DEFINE(HAVE_SOCKADDR_STORAGE)
++	AC_DEFINE(HAVE_SOCKADDR_STORAGE, 1, [have sockaddr_storage])
+ fi
+ 
+ AC_CACHE_CHECK(for struct ether_addr, ac_cv_ether_addr,
+@@ -94,7 +97,7 @@
+ 	)
+ )
+ if test "$ac_cv_ether_addr" != no; then
+-	AC_DEFINE(HAVE_ETHER_ADDR)
++	AC_DEFINE(HAVE_ETHER_ADDR, 1, [have ether_addr])
+ fi
+ 
+ dnl Check for network system libraries.
+@@ -144,20 +147,21 @@
+ case "$ac_cv_have_curses" in
+ 
+ slang)
+-	AC_DEFINE(HAVE_SLCURSES)
+-	AC_DEFINE(HAVE_HAS_COLORS)
++	AC_DEFINE(HAVE_SLCURSES, 1, [have slcurses])
++	AC_DEFINE(HAVE_HAS_COLORS, 1, [have colors])
+ 	;;
+ ncurses)
+-	AC_DEFINE(HAVE_NCURSES)
++	PKG_CHECK_MODULES(ncurses,ncurses, [LIBS="$LIBS $ncurses_LIBS"], [ncurses not found])
++	AC_DEFINE(HAVE_NCURSES, 1, [have ncurses])
+ 	AC_CHECK_FUNCS(has_colors)
+ 	;;
+ n_curses)
+ 	CFLAGS="-I/usr/include/ncurses $CFLAGS"
+-	AC_DEFINE(HAVE_NCURSES)
++	AC_DEFINE(HAVE_NCURSES, 1, [have n_curses])
+ 	AC_CHECK_FUNCS(has_colors)
+ 	;;
+ curses)
+-	AC_DEFINE(HAVE_CURSES)
++	AC_DEFINE(HAVE_CURSES, 1, [have curses])
+ 	AC_CHECK_FUNCS(has_colors)
+ 	;;
+ *)
diff --git a/net-analyzer/trafshow/metadata.xml b/net-analyzer/trafshow/metadata.xml
index d2e74e0b272d..03aa50bab7e3 100644
--- a/net-analyzer/trafshow/metadata.xml
+++ b/net-analyzer/trafshow/metadata.xml
@@ -2,5 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-<longdescription>Full screen visualization of the network traffic</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/trafshow/trafshow-5.2.3.ebuild b/net-analyzer/trafshow/trafshow-5.2.3.ebuild
index 5471cf82e071..7ec02d59537d 100644
--- a/net-analyzer/trafshow/trafshow-5.2.3.ebuild
+++ b/net-analyzer/trafshow/trafshow-5.2.3.ebuild
@@ -1,8 +1,9 @@
-# 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/trafshow/trafshow-5.2.3.ebuild,v 1.13 2012/12/05 16:47:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/trafshow/trafshow-5.2.3.ebuild,v 1.14 2014/07/18 03:11:48 jer Exp $
 
-inherit eutils
+EAPI=5
+inherit autotools eutils
 
 DESCRIPTION="Full screen visualization of the network traffic"
 HOMEPAGE="http://soft.risp.ru/trafshow/index_en.shtml"
@@ -13,28 +14,27 @@ SLOT="3"
 KEYWORDS="amd64 hppa ~ppc ppc64 sparc x86"
 IUSE="slang"
 
-DEPEND="net-libs/libpcap
+DEPEND="
+	net-libs/libpcap
+	slang? ( >=sys-libs/slang-1.4 )
 	sys-libs/ncurses
-	slang? ( >=sys-libs/slang-1.4 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-gcc44.patch
+"
+
+src_prepare() {
+	cat /usr/share/aclocal/pkg.m4 >> aclocal.m4 || die
+	epatch \
+		"${FILESDIR}"/${P}-gcc44.patch \
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-tinfo.patch
+	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	if ! use slang; then
 		# No command-line option so pre-cache instead
 		export ac_cv_have_curses=ncurses
 		export LIBS=-lncurses
 	fi
 
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "make install failed"
+	econf
 }