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

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

7 files changed, 115 insertions, 35 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/Manifest b/net-analyzer/trafshow/Manifest
index 7fa17e885cec..c61ade048b24 100644
--- a/net-analyzer/trafshow/Manifest
+++ b/net-analyzer/trafshow/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX trafshow-5.2.3-gcc44.patch 382 SHA256 456eda4c522bf4d3123dcc69aa0d303990435062920a63696792652fcd9cb4e1 SHA512 adf8ee3a6b22afd8e031614c0bcf91ae678e6a2a581a1bcfbb08e06c497fee34068320bf5e9aaf9283efca93d892aa9ad891663ac4aee6c059bec8921f7f479e WHIRLPOOL 9d1d0ea3e94268ee2265c56c9f925894c7f81f2d2bc85152799285810191e041349f8231a54350a3d57b093dd24330370cf1e247ddc1630220e5e1afa6ec16d6
-AUX trafshow-5.2.3-gentoo.patch 741 SHA256 cda7764e58287aea1595dff346a926577cd568f21d312b537e42e4757d7b324a SHA512 fc2f69782764d7fc124892b995b12c6b9e207cb3def452525d73ac15f96b82bec2c18bf8493e23b60f0190f8dc0af809f618f2c4dd812dd1acbdd85ee6166251 WHIRLPOOL 099790bdf1ae9cca69724b4f573e3212f551cc89c6412ae1d7189a9b8dec6dead6cf6c452268c8bec271cc100be6f7f7e9053d15dce8a73886fe28b57b473155
+AUX trafshow-5.2.3-gcc44.patch 215 SHA256 f8fd709d231fee3df37434c4a394912ba16c6953b70813e7dd5696821cc908a5 SHA512 64157530b0605758f083bdccc6729d9f785d08f343fa2d6de22b0f60533c75c8e522ea891a31a3f8137af95075c5004b7b520c8e2dd252ab772b7b9ac6de8212 WHIRLPOOL da124d276c0dd304e198b472091493d866339b606639dcf13ee5322875dc886be29a7fe34c5292d9ea7a6464c4c16cf964d95ffa017724cd83159a71a3c749c5
+AUX trafshow-5.2.3-gentoo.patch 638 SHA256 0021f66ddf4c5648c828c9396b23ae65a9478e43c4866f0edcab6537b917dda5 SHA512 fccba5018a5fd7c1665bc8004507d7689a101dee10560c007e68a77a4c07824ae10954fb3e9555abe3991c495e2bd235bdbb41e3ca027355a1d0a08ea3aff686 WHIRLPOOL e4f82d5b0e036fccb5151940764a817af398bf277eb155bcd7816b5db9f7fb016c73a42ed2efa0143018b4bfd871b2dafc108ab675b4cea6e261db7961efc8b8
+AUX trafshow-5.2.3-tinfo.patch 1864 SHA256 670938611681f771db81e66fffd52a65da1d959b3a2804fa8edd8e62160356bf SHA512 55414a2f014f046b76c678aa6801ed6d5cb1cd9215854b1e0491192b06e42b71aad88a37507a446d13571cf95796807af06a3094f9167a507b3c4e8f1d3bd056 WHIRLPOOL 2282836b3589b733a6abcbb327b2a97770298b5e4f68bba1bb4ab53b60475e5dc7a1c05a99ab4e317ebd95269daf02f2030d0fb61696ae67904e65f13fbb619a
 DIST trafshow-5.2.3.tgz 142615 SHA256 ea7e22674a66afcc7174779d0f803c1f25b42271973b4f75fab293b8d7db11fc SHA512 9ea57c319cb177de2d29eaf2a09c06f0bd7efcfc3e50d5fa5cc18f193c6dfc0109d4388ccbaee7bf2db37b5418fc0f4b6ce47a5558b652ecf9e891a813ef8540 WHIRLPOOL ebdd335029aa6bbd85320f7f587a65f8ca645d4236fae21b2d70ed7351edb8cfea4066491f8a803775d30b840663eef621ef8e9e4fbd321d0f3da08de6d90234
-EBUILD trafshow-5.2.3.ebuild 975 SHA256 a57efc74bdcf0a3ba46fbe52f13f6ae9297adbc5de896e68c35634cda73eeca8 SHA512 d19df830ec31b240c538bf840c0c7a3e31a52e4dc7f32187906fcc017e882c8bfab93e69134553739b90f4dad15bd6316b16dc69388dc99d121cec2ec37e9820 WHIRLPOOL 0d65e5377c7982b3fac5f1f7dc3f5d9bd53dc01f1fa996750541b1f0a508655d809d3604e9548faaacadcbf6d87fe5b44cd8d425cbe7af8975ab568c25216be1
-MISC ChangeLog 5008 SHA256 5660350b7652ecdf298b18378e76e1d2ae67e08a04de2b7a57ab8f6419477c15 SHA512 e03cd64fd43cc9484034058b1568db65d5ffd39039fed8b4f3864e814efcef5bbdc5aa45c60d1beef3c41f6975c089ba178ded237c41d662f613e01e24f6e0db WHIRLPOOL 627be2dcf6710e69b5a720f014d9943264f98c730a81ccadb5e557897ed765a62cf2585a0986e5087524f855a13a73b8800dc944fb7c80167ba9c494e571538e
-MISC metadata.xml 243 SHA256 e55f8915328809444208a99003ebebee8247b729e70320c57748069e1ba48586 SHA512 fe0916f28145d330024bc9be6c389505ca43c424de9de3409312eddd0e31d3551f81b2e40ba8452c4aff983b0cf53292f86d29f34f05937d5f18d12fc56866b0 WHIRLPOOL d95ca8e72599eb7568e4ff4ed834ffc2332b539311323a543a1b957af11d9be91e302179b8a9aaf2805950406e591c2339e2509143dcea0c4596737b925c87b8
+EBUILD trafshow-5.2.3.ebuild 950 SHA256 4c9c2c81fc66965f94dfc97bb69150d643b8bfc4dab583b496d5f122230b69f0 SHA512 74d08f535e09b7b0c4a85985bee94b2a22b630e35b3677839067e7d51bbc1330d8cd6682290311a7fb8d474211c7491c825f76e82818fa2efdf17a5a6a6e3e49 WHIRLPOOL 64abc38c6002f4641f236c08dfddcfedf8bfd9e042dadce6c26b5e52159b2e4eec5c5021644617139c0a69c08d19a418ad616aee0e1ca3854e521867dae67021
+MISC ChangeLog 5312 SHA256 d549feda81fc43cd6a154c5d0759d3dfd79e4be7e96d3340c4a633ef93dbc567 SHA512 6615af96b9f13c7c25ef0de27238016f0c08724596951f8de6459d89f77447e9f88fab70bd9ca462e20b7976829bc1b64eb91011a50e82ed0989c44614f64056 WHIRLPOOL 242fd252ec268c79ac4a3ad4a90515f32526f1859c5239e0d5b11d81f6247096765099a673972342941697ed5d0f540faa70e2a35189a867aec4d2dde59cbacf
+MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlC/eqYACgkQVWmRsqeSphPi3wCggQvzT8YdC+NzpCxJLTwyz49E
-gCEAni75APetWAwWZz05aDXIwrWBdLiE
-=NnMF
+iEYEAREIAAYFAlPIkHUACgkQVWmRsqeSphPsBACfXOdYH9o3PG1Cq/nIwMqsGEMw
+8ToAniEm1YLuzpjJJD8h0I13avVdIKq8
+=qxjN
 -----END PGP SIGNATURE-----
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
 }