EAPI bump. Fix building against sys-libs/ncurses[tinfo]. Drop <sys-libs/glibc-2.4 condition. Clean up patches.

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

7 files changed, 66 insertions, 36 deletions

diff --git a/net-analyzer/nstats/ChangeLog b/net-analyzer/nstats/ChangeLog
index 1bbb707ed322..f40b77d569e5 100644
--- a/net-analyzer/nstats/ChangeLog
+++ b/net-analyzer/nstats/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nstats
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nstats/ChangeLog,v 1.21 2012/03/19 12:01:09 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nstats/ChangeLog,v 1.22 2014/07/15 00:14:28 jer Exp $
+
+  15 Jul 2014; Jeroen Roovers <jer@gentoo.org> nstats-0.4-r2.ebuild,
+  files/nstats-0.4-glibc24.patch, files/nstats-0.4-makefile.patch,
+  +files/nstats-0.4-tinfo.patch, metadata.xml:
+  EAPI bump. Fix building against sys-libs/ncurses[tinfo]. Drop
+  <sys-libs/glibc-2.4 condition. Clean up patches.
 
   19 Mar 2012; Jeroen Roovers <jer@gentoo.org> -nstats-0.4-r1.ebuild:
   Old.
diff --git a/net-analyzer/nstats/Manifest b/net-analyzer/nstats/Manifest
index 2bcab340eabd..24537887d03d 100644
--- a/net-analyzer/nstats/Manifest
+++ b/net-analyzer/nstats/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX nstats-0.4-glibc24.patch 4942 RMD160 18aa09abdad5e3362e44d6996a052d4b6dfba04c SHA1 4b754f8f438df3a2e7097a8f4bfd04458b67750d SHA256 44cfd1b52bfec1170baaae542b91c85e2ce531e6b7c114365e4b635dfd141256
-AUX nstats-0.4-makefile.patch 633 RMD160 b97e6329ebff15cf575af52217d3b70491126fc3 SHA1 f888c5caf5a13ff66840b3230255e4af936d309b SHA256 9266bf5c9dd1a4f0ad2fba757e055293eb01dc34631a6651d823793e31a41ea9
-DIST nstats-0.4.tar.gz 71526 RMD160 af5f7f5b3bc1be052d2b979d890f7b14d959d87b SHA1 3c3bfb878155c99dc3c54f096a106c84f6aa6885 SHA256 ab36626ca06e734800a31ec64f76bf1dc0d9e579f3542155a7ce89030f74aaf4
-EBUILD nstats-0.4-r2.ebuild 739 RMD160 1ddc0b713f022f35caa045965872d22cf3266e61 SHA1 4d16980dd171ad78198956ffd7b642830b27d1fb SHA256 47d52fd24cf1db6dbee942dc9cf43329e77e46733606108f8048fb9bfc3662d8
-MISC ChangeLog 2558 RMD160 1a478bc022f10c6247f6ab7badefc0dc722f573d SHA1 97cf9f9d6e162a8f4569bf119482497192084f63 SHA256 5398b85201112f3158205f9eff6d965a8f2287e48a18ddba6166d9fa851032c6
-MISC metadata.xml 266 RMD160 969673ed0966bf0d1e582411b1cb0785e816cc59 SHA1 003409dc9f914751f14624b5efbaf6bdc8db9b03 SHA256 730f6ab624d9d75e5188f993ab63c993c78f5afe268d50da67c525e4162bbe48
+AUX nstats-0.4-glibc24.patch 4546 SHA256 415e5a0d30c7c62086764c4b8745753f98626a47a95ce286911a91246de758ee SHA512 c6ffc36d13a5ad22ecf0333fddb9643e9dcf5b22b337e351f11a133caf647f93511a08cedee2c72f886c65a70f64409c1a86135933e8802ccfdcea178f61e03a WHIRLPOOL d139b06ccc2acc1b39876ffa404faf9b8daf43bea7c52ab3b7efad57b5df1f5c798aeaa7c6dd00cb824a3893c6558252a43502fd93354644e8b74c49ebc606e7
+AUX nstats-0.4-makefile.patch 611 SHA256 8077cfdb1ac89e6afe84589b951bc65eed4e7675260fdf1a07fa2d060832348d SHA512 e47cffad1562f767556baf5086db8039f7b504ca4e4f1ebe458d4ce9b9a65cde5f4d7131e4ff8992379ca3db6ffcf30c5e8499a2993e29874f50b00be2d9b8af WHIRLPOOL 604a33700ec369feaccb40fb6e211ca3dba9d09f9af35bd11e4c4f113be47d85e908949acd38fa4b8389d781a85554012be09c008704b5e81ed8967207289146
+AUX nstats-0.4-tinfo.patch 469 SHA256 bfa50b7a044eadc01023c64196f836776ffa1dfbbfc3f7a457f64bd95d94ed7f SHA512 e7c99f91adacd33222f1f9c4fa1b0b342dfc8309a459b9239eb099f1a79972a3065d76560df0b0455c20f994c343f43b5be55de0464031f064c03b4e1dfba843 WHIRLPOOL cee53bc28a1986d5dd8d0c285ccd831a32c4f85c95aab4e99e3405110c64c31fd3367d4d59cbfa81b94e0fe430bed395df8e90a6a6f67bc60e3c405ca4b680c9
+DIST nstats-0.4.tar.gz 71526 SHA256 ab36626ca06e734800a31ec64f76bf1dc0d9e579f3542155a7ce89030f74aaf4 SHA512 89e88eb0f707cb125fbf02bef93a0bbbd1409f3516d4b333e06d0a3ffe42f5e8d2b655fa6c7a0c63b7d71c7a2f74f6207e5ed158f7d102f6d47ac6e436da3315 WHIRLPOOL 87258661fa288164f31645109783737d124d899c005fbe18f3fc65d227900da867668ff8e1f63b339c628e178d778a0efb2f4a8e93de5dfa9e6109af62beb697
+EBUILD nstats-0.4-r2.ebuild 778 SHA256 fbad7f659eca29f56fb9c210ed939ed076e930fb746ebb0ae00b56ea145e490d SHA512 0dc99067cfbd7b81a445415843399d854aadaf9011f32a5463582a1792d70e541359d760ce411c4737fb62d1429592b76f26d59b3458ef30b7c6b508716c8b61 WHIRLPOOL b815db57f5e4ed209cd8f2c78b05476f10e268c6f627b1a8b9fa57af732b1c00fbffbf1227d6e10c5be09dd6bc8a8f12411782f9fcf315f6553733fd76c0b2d5
+MISC ChangeLog 2857 SHA256 6190e716d393dbcf90a664db5659775655d4bc3a892ee7d055e96282c39802b8 SHA512 942c9e7bdcd4531f394fc18c8b719bcfd424e86cfb3d2067ed9665e6eede56704a8359013cedfc7525a05ff775b6588d241ab728bbec3c64b2e72cfd09bbd049 WHIRLPOOL eedff3f0c175fda50db96d475f4e5b502eaa55e685e7e64596c2161b2b7ddf030a94c4a14232a2e2458524fd09d71a2e927ae816710a2e7688daf827ed835147
+MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEARECAAYFAk9nIAsACgkQVWmRsqeSphNsKQCcDqfkDCyRRydxsURG1qC3lOpi
-hs0Anihho1+wa3RPIUmTxQOWhar8I3Xd
-=Tngp
+iEYEAREIAAYFAlPEcmYACgkQVWmRsqeSphPb3ACcC5ZT05u4+DfBj27OVcqnQ8jT
+vR0An3QyL+ZofWq0LJ87ILC9xrzWE5Ok
+=U5ER
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nstats/files/nstats-0.4-glibc24.patch b/net-analyzer/nstats/files/nstats-0.4-glibc24.patch
index 053efdcb8ec7..597c0cd24285 100644
--- a/net-analyzer/nstats/files/nstats-0.4-glibc24.patch
+++ b/net-analyzer/nstats/files/nstats-0.4-glibc24.patch
@@ -1,5 +1,5 @@
---- ./nstats-0.4.orig/src/packet.c	2002-05-02 17:34:25.000000000 +0200
-+++ ./nstats-0.4/src/packet.c	2006-03-27 02:15:47.000000000 +0200
+--- a/src/packet.c
++++ b/src/packet.c
 @@ -148,9 +148,9 @@
                      stats.ip.ipv6.icmp.dst_unreach.s_admin += hdr->len;
                      break;
@@ -35,8 +35,8 @@
          case ND_ROUTER_SOLICIT:
              stats.ip.ipv6.icmp.nd_router_solicit++;
              stats.ip.ipv6.icmp.s_nd_router_solicit += hdr->len;
---- ./nstats-0.4.orig/src/stats.c	2002-05-02 17:34:25.000000000 +0200
-+++ ./nstats-0.4/src/stats.c	2006-03-27 02:18:41.000000000 +0200
+--- a/src/stats.c
++++ b/src/stats.c
 @@ -316,15 +316,6 @@
      print_line("Echo Reply:", ICMP6.echo_reply, ICMP6.cnt,
              ICMP6.s_echo_reply, ICMP6.bs, .0);
@@ -53,8 +53,8 @@
      print_line("ND Rtr Solicit:", ICMP6.nd_router_solicit, ICMP6.cnt,
              ICMP6.s_nd_router_solicit, ICMP6.bs, .0);
      NEXT_ROW;
---- ./nstats-0.4.orig/src/stats.h	2002-05-02 17:34:25.000000000 +0200
-+++ ./nstats-0.4/src/stats.h	2006-03-27 02:16:25.000000000 +0200
+--- a/src/stats.h
++++ b/src/stats.h
 @@ -233,7 +233,7 @@
  
                      cnt_t noroute;     cnt_t s_noroute;
@@ -74,8 +74,8 @@
                  cnt_t nd_router_solicit;   cnt_t s_nd_router_solicit;
                  cnt_t nd_router_advert;    cnt_t s_nd_router_advert;
                  cnt_t nd_neighbor_solicit; cnt_t s_nd_neighbor_solicit;
---- ./nstats-0.4.orig/src/nstats.c	2002-05-02 17:34:25.000000000 +0200
-+++ ./nstats-0.4/src/nstats.c	2006-03-27 02:25:42.000000000 +0200
+--- a/src/nstats.c
++++ b/src/nstats.c
 @@ -528,12 +528,6 @@
                  ICMP6.s_echo_request, ICMP6.bs);
          print_line("Echo Reply:", ICMP6.echo_reply, ICMP6.cnt,
diff --git a/net-analyzer/nstats/files/nstats-0.4-makefile.patch b/net-analyzer/nstats/files/nstats-0.4-makefile.patch
index 23139966fae6..6c4577e333f6 100644
--- a/net-analyzer/nstats/files/nstats-0.4-makefile.patch
+++ b/net-analyzer/nstats/files/nstats-0.4-makefile.patch
@@ -2,8 +2,8 @@
 # net-analyzer/bmon, sys-cluster/ceph and sys-process/nmon
 # bug #364685
 
---- a/nstats-0.4/Makefile
-+++ b/nstats-0.4/Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -53,7 +53,7 @@
  	mkdir -p $(DESTDIR)$(prefix)/bin/
  	mkdir -p $(DESTDIR)$(mandir)/man8/
diff --git a/net-analyzer/nstats/files/nstats-0.4-tinfo.patch b/net-analyzer/nstats/files/nstats-0.4-tinfo.patch
new file mode 100644
index 000000000000..ce62c8100f9b
--- /dev/null
+++ b/net-analyzer/nstats/files/nstats-0.4-tinfo.patch
@@ -0,0 +1,18 @@
+--- a/configure.in
++++ b/configure.in
+@@ -15,11 +15,12 @@
+ 
+ AC_TYPE_SIGNAL
+ 
++PKG_CHECK_MODULES(ncurses,ncurses,,AC_MSG_ERROR([ncurses is needed]))
+ 
+ AC_CHECK_LIB(ncurses,initscr,[
+-    NMON_LIB="${NMON_LIB} -lncurses"
+-    BMON_LIB="${BMON_LIB} -lncurses"
+-    CMON_LIB="${CMON_LIB} -lncurses"
++    NMON_LIB="${NMON_LIB} $ncurses_LIBS"
++    BMON_LIB="${BMON_LIB} $ncurses_LIBS"
++    CMON_LIB="${CMON_LIB} $ncurses_LIBS"
+ ],[
+     echo
+     echo "Missing dependency"
diff --git a/net-analyzer/nstats/metadata.xml b/net-analyzer/nstats/metadata.xml
index a62c714fd2c1..03aa50bab7e3 100644
--- a/net-analyzer/nstats/metadata.xml
+++ b/net-analyzer/nstats/metadata.xml
@@ -2,5 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-<longdescription>Displays statistics about ethernet traffic including protocol breakdown</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/nstats/nstats-0.4-r2.ebuild b/net-analyzer/nstats/nstats-0.4-r2.ebuild
index b6e968168736..b2f7fd73be54 100644
--- a/net-analyzer/nstats/nstats-0.4-r2.ebuild
+++ b/net-analyzer/nstats/nstats-0.4-r2.ebuild
@@ -1,29 +1,35 @@
-# 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/nstats/nstats-0.4-r2.ebuild,v 1.4 2012/03/18 17:49:08 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nstats/nstats-0.4-r2.ebuild,v 1.5 2014/07/15 00:14:28 jer Exp $
 
-EAPI=4
+EAPI=5
 
-inherit eutils
+inherit autotools eutils
 
 DESCRIPTION="Displays statistics about ethernet traffic including protocol breakdown"
 SRC_URI="http://trash.net/~reeler/nstats/files/${P}.tar.gz"
 HOMEPAGE="http://trash.net/~reeler/nstats/"
+LICENSE="Artistic"
 
 SLOT="0"
-LICENSE="Artistic"
 KEYWORDS="amd64 ~ppc x86"
-IUSE=""
 
-DEPEND="net-libs/libpcap"
-RDEPEND="${DEPEND}"
+RDEPEND="
+	net-libs/libpcap
+	sys-libs/ncurses
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
 
 DOCS=( BUGS doc/TODO doc/ChangeLog )
 
 src_prepare(){
-	epatch "${FILESDIR}"/${P}-makefile.patch
+	epatch \
+		"${FILESDIR}"/${P}-glibc24.patch \
+		"${FILESDIR}"/${P}-makefile.patch \
+		"${FILESDIR}"/${P}-tinfo.patch
 
-	if has_version '>=sys-libs/glibc-2.4' ; then
-		epatch "${FILESDIR}"/${P}-glibc24.patch
-	fi
+	eautoreconf
 }