EAPI bump. Clean up patches. Fix building against sys-libs/ncurses[tinfo]. Remove short <longdescription>. Make sure nothing is done in libpcap/.

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

11 files changed, 117 insertions, 183 deletions

diff --git a/net-analyzer/sniffit/ChangeLog b/net-analyzer/sniffit/ChangeLog
index 8293e172cd4b..2b7e149ca590 100644
--- a/net-analyzer/sniffit/ChangeLog
+++ b/net-analyzer/sniffit/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/sniffit
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sniffit/ChangeLog,v 1.24 2013/02/06 19:50:40 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sniffit/ChangeLog,v 1.25 2014/07/17 02:15:28 jer Exp $
+
+  17 Jul 2014; Jeroen Roovers <jer@gentoo.org> -sniffit-0.3.7-r1.ebuild,
+  -sniffit-0.3.7-r3.ebuild, sniffit-0.3.7-r4.ebuild,
+  -files/sniffit-0.3.7-flags.patch, -files/sniffit-0.3.7-gcc33.patch,
+  files/sniffit-0.3.7-gentoo.patch, files/sniffit-0.3.7-misc.patch,
+  +files/sniffit-0.3.7-tinfo.patch, metadata.xml:
+  EAPI bump. Clean up patches. Fix building against sys-libs/ncurses[tinfo].
+  Remove short <longdescription>. Make sure nothing is done in libpcap/.
 
   06 Feb 2013; Agostino Sarubbo <ago@gentoo.org> sniffit-0.3.7-r4.ebuild:
   Stable for sparc, wrt bug #454014
diff --git a/net-analyzer/sniffit/Manifest b/net-analyzer/sniffit/Manifest
index aad5372f4a20..3f7f3c273192 100644
--- a/net-analyzer/sniffit/Manifest
+++ b/net-analyzer/sniffit/Manifest
@@ -1,12 +1,17 @@
-AUX sniffit-0.3.7-flags.patch 1102 SHA256 2d43f56bdd7232481258ca7abaa44bcb799eb2d07912bcc17e04940bbeb06056 SHA512 113847198f09214d762225e97072892980618e4a826d8d2be294097ab0acb959a4fb9c78d12165c7ef7db35614a1a9abf3365669793e584d8953a83dbd1d2d40 WHIRLPOOL 89b2a41d0ef391f90def818ce76bf17113b2959538195b0d8b4e9f44961da7aad1ed7c5ff149d168a330cca1b77bed2bf92f052567f77ef8dad5be8e6f23261f
-AUX sniffit-0.3.7-gcc33.patch 496 SHA256 59262b2d7f5f78c2e97b1a52ff69a7574126fba6962e38f1c19694540dd467d7 SHA512 a23e0ec1ee7fb60efbd03a5ff0c02d8a6d73c2283396db027aab2e2fa56889dcb40c8ca78b333ae64f85a3bd8f29718963d03bf833bcf79f444dc7d283ed047d WHIRLPOOL 89490288fa687ed2a4bb9381e2f2ed3054eae67b2108734f368b970a571169a30479e63e47a0c72f48a7004ff9ab83824e0df85245c1b71160c3084ab49f7a63
-AUX sniffit-0.3.7-gentoo.patch 858 SHA256 8a809583d7b25923d100ae7029d6645e34b365816789479600a2a52986515136 SHA512 b57cae0395e934b4a2e828d548a28d0e93161ddd5725ee293d24fe9101cc47b9fb95bd2445a0779ab423d2ad6beca312244b208b1a14e3c479450b04621cef41 WHIRLPOOL c3ba9ed2af3ea589a3232e08da66b3694d74944434e11948eb805c03a3ecf5ad287ee17506b66630e2522ea9ef6fb58c75126868991d19eeb45bfbd16b319567
-AUX sniffit-0.3.7-misc.patch 3677 SHA256 4b796567a07c64febccf2c335b68cead5bcef7cd042cdfe25180aa3683904a66 SHA512 770f4c27091865f4933759017aa1c050a3e1d89f6d1b5d700cd4e74d0645a4edf205699658b95f8e4ff32f17c11048f53ae401ebaad7fa161507c9e847d44df8 WHIRLPOOL 52f7957cbab90ee3bbfe57582671d34ed4cf30adc6e68c4cb010ef3a3063e74666dce7fce92cf6f1207b078618ef2caa1fdd333de311a7b141967e0cd510b7b3
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX sniffit-0.3.7-gentoo.patch 1164 SHA256 512f6a3b4b5da6169253a609b3d459fdb833b064d0f0c218f918bbb363c6a90c SHA512 e71684e0be70228c347fe61afdee7e6bf0f116b0ecb603ed4dd6838f457b5b480092ac735297ce64f84f9c8858b5b11d7a1e746c0790380fbf6f7cf8d9875865 WHIRLPOOL d4f674be3fec37861857af5f8ae07bd3a8da3733cd49b13785dbe431f58053596b8517ae8a6d6e6619f5198271b9027ba5d772db92391696c20ee07e280f3cc9
+AUX sniffit-0.3.7-misc.patch 2957 SHA256 536299d8b939c11751db2853741d591d8334eebf46d42e4adbf5898d13277213 SHA512 d07298642bab1903c7a93a2b076dcf2cf50a2a5ef5b05e7e9abacaa88cff3089c9028e7721cacbc403b992ad170f64976e83835e441b44e6ac69ee0753e2714e WHIRLPOOL 94dce9cad45c757ddf847b7c4db53fb66fa20c912c7e2b9f92a13e546b60d8ae958fe0a0756b29e307d4582ffa02918d41fe37b11c0300b960f26531304a22b7
+AUX sniffit-0.3.7-tinfo.patch 1063 SHA256 4f966dfb7fdaf78e571f79f11e5948a8eccd543f7ee039da742a37458116a665 SHA512 d4959d6c27928c3d3f85fdfdfb1afd4f7ad24000adb61f565fef68b46b46aba96b61572177db058875dc3a70154223cb620077e6681c8a7f62483e614f8e92c6 WHIRLPOOL 00713ff231028c6064280c9297524cfc979aa186d9b354bb8ff0cfda424ff368469e607d0893b7e7db362ad4ae288d82dedc091d26a1ba87ef2686be14e99022
 DIST sniffit.0.3.7.beta.tar.gz 212419 SHA256 78b5137be45bdff738525dee351908ae0b8a79e2d999e33b34278a4a7fc08ca0 SHA512 b32d1f17d589ee1d1afc7986640a2b9f451cdb26ee2d077db1eaec1bb77ed353bbbb6a79bd25f915b3a40b7a279f9fc7855706150ec3a24f8937a152ac91b8d1 WHIRLPOOL 834c3c6a177851d219bc593fe1ca4052641aa85a610aa76b5bd65bbd47848280bb5c55b74402b96c61bd7fd980e92137c27c324c9c4fc9259e2cf137ab3afd41
-DIST sniffit_0.3.7.beta-10.diff 95457 SHA256 0c748822f8b12f6de2231a301762aa291742f7119592e3c3022ce7ba9a78df9c SHA512 ec02b391333d4cb9cc581a748c547becc2614b924d9b22b8fb8bd18cfef1925fd8a0bc811d51e707774510f0095e2693607fcf21e51759212f6ced792224409f WHIRLPOOL d74d70c0521dfe1a24c73fecbe2a2c65e668c1dd5af7d67bfe3291ee5736f1fc3687ff7d935418f49f99caf456372f1b70afe7f9d7ffeac7734f43f9e2979cd3
-DIST sniffit_0.3.7.beta-15.diff.gz 15597 SHA256 555762662a2524bed84e13f813efa4938320b3b7f94a7c9c2fbb14c39ef45be0 SHA512 6d13da816b40c4f58f6619466b1c5f2ea26f45ad4f8c5a17e1ea3126ebdc36ba1438cd82b4f3781869ec74530eda1ff51cf76b3c1fff1ca2e46921926414a98a WHIRLPOOL 59ea453e6e0e2031525cdeaa8fefbba0cc57e1762bce97b5a3288fb41aaee3fba209bc293c5ccd58833ce2f10a16c5d2ac2643ddef1751f081e30e6868a5e2e1
-EBUILD sniffit-0.3.7-r1.ebuild 1059 SHA256 9e0b1d195f81430fae3031c8575cbbbf3492154dd157acc6d4109a2be998f65b SHA512 2b68207b29ffef61a17569a4486d64f1692db86a01164721326f95aefcfadad1063b254259165ef580bab8bec052d260a6d30cfe561b234fc3f13eb71fd9b464 WHIRLPOOL 8434704bf2a8e209569e06f5dba1fb8a141b62de597ec8ddca28b76245761a7f31356ee677708854bb0da41d56a7590cc6d70fa9417c105a6f605e774fbb4a4c
-EBUILD sniffit-0.3.7-r3.ebuild 967 SHA256 afbd8b9f5a9fd52b2d7527281fa3bc00123461697da79b3064296fb8cb5d9c75 SHA512 674c4ff42103bca3199fbeb5e9a558602d45977c6fd2af1698300106861eb239aee9f2c0a486d0840ffdcf4d9611c201957aede8c4de9dfca813813b61b032cb WHIRLPOOL 7b8d764a57fccb23f56623c7eae6c26390325d9b3333d34b5cc3bf1a91d9fbf57e7b8ba19a47c5924fd0f6191805758b28cd97e7676bc71e0a374915df47bc46
-EBUILD sniffit-0.3.7-r4.ebuild 862 SHA256 0d0e68bf9793a011fbd5b6931383b0fbc877cfd603c64ef3351736a35b0f94e9 SHA512 db0fa8b34209cd84957b5d319c309cce809340f3d134bd26dcd8802baf770eda2d4cd290889d229ab46a5c261360e14d8039b5433ca0c04d26b6fb7639ba143b WHIRLPOOL 706efe6de562e49bcdb57f8f41d7bd95735cdaf4808bc823780799ccf0ff8bfcd8bd6dbec587c66dfb633bb06fd4dcb61cc06adcb831b54cfb464540308bc02b
-MISC ChangeLog 3541 SHA256 3abbad95caf70220c4cabd83cbf5fe6f313901441656a4eea590c21c9632b3de SHA512 66a1dd33ba797ffdd5de2ac74837bc71ebb2718956471a0bb0ce1682149becda128af82e93d164d6b3364ec925208125b7b797ed7b3dd4f21237cfada79ab723 WHIRLPOOL bd335d114f9505772e8acd02476ce854f1656a3f0e0ac90495af5fed8d01983171b264a47a11268a353718302dd19489d2ba5de6a731c970105a65f358fd905b
-MISC metadata.xml 221 SHA256 6f7db930e28fafe15a3849b6c7c71882147d47c07765a14290b36fab2b426a17 SHA512 a16137f47b0043cf674d0aa4dfec55a0791c9b01f180659c308580d1af66b7dab557cae3a6648728217b61780a1d3e84203207505f6582dcc29b0a51ade873bc WHIRLPOOL 5abbaf34b7b0648318fedb5fbcadc1fe65e93932d7af961f04c0110b3d2feff6d50972e4a6f41af946404da2ba93d068c02aa253474dcc86c53e5dda268b0bc5
+EBUILD sniffit-0.3.7-r4.ebuild 908 SHA256 367b731ef6258bebf69e5e4eb615499be6c09a08682fc79e95ba2238469c7e9e SHA512 13089452191b41bd731cc398ead141552ccf2d9881f7ece20faf2bbf8180c1df7e5b748355c2acbba5e2fdc012e2f8cda7644af3b69fb425af5dc530fda83dbd WHIRLPOOL 11cca0a1bc9e23a385922d179f7f9d459ad0ec2057b7005693f4d9c24f718d15fec320070a14f1a97b49eef2a034fd4019799a0cc338e7d23c3c55a50490b1b3
+MISC ChangeLog 4006 SHA256 774ec7443fb0f6045a4bd10cbe6f88813f9bf6fb2b587eead461384bcd8f7272 SHA512 198c0617a22b20c43483d19e0dc2eb5306d5918e0f99ae1371008952c84fb625465c38614bfa822b9a5f2bcff2bb6b69cf1c504a6203c8970bb0ff4e84c9147d WHIRLPOOL eb7524f6ab73a7e38fb99932585e7538895f2d19d2b06705e07f715313662bc91bb1bbfb59b627757b28fe4046e0f6ad75902f31715dd28f95197f9f27cea2d8
+MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlPHMcEACgkQVWmRsqeSphPGfACdGWMa1yiYOnfzhI58QuXVHvnj
+pQ8An19ggIdPqisqTfID4lnSRiTgeim4
+=axCN
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/sniffit/files/sniffit-0.3.7-flags.patch b/net-analyzer/sniffit/files/sniffit-0.3.7-flags.patch
deleted file mode 100644
index fe9c14c15f94..000000000000
--- a/net-analyzer/sniffit/files/sniffit-0.3.7-flags.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Do not build or link against included libpcap.
-Respect CFLAGS and LDFLAGS.
-
---- a/Makefile.in	1998-07-16 18:17:10.000000000 +0200
-+++ b/Makefile.in	2010-09-13 00:10:51.000000000 +0200
-@@ -10,10 +10,10 @@
- LIBS       = @LIBS@
- DEFS	   = @DEFS@
- OS_OPT     = @OS_OPT@
--OBJ_FLAG   = -w -O2 -c
--OBJ_OPT    = -I./libpcap -L./libpcap
--EXE_FLAG   = -w -O2 -o sniffit
--EXE_OPT    = -I./libpcap -L./libpcap -lpcap
-+OBJ_FLAG   = $(CFLAGS) -c
-+OBJ_OPT    = -I/usr/include/pcap -L/usr/lib
-+EXE_FLAG   = $(CFLAGS) $(LDFLAGS) -o sniffit
-+EXE_OPT    = -I/usr/include/pcap -lpcap
- EXE_OBJ    = sn_packets.o sn_generation.o sn_interface.o sn_cfgfile.o \
-              sn_logfile.o sn_resolv.o
- DEP_FILES  = sn_config.h ./libpcap/pcap.h sn_data.h sn_defines.h sn_plugins.h \
-@@ -26,9 +26,7 @@
- 	@echo "Succesfull compilation..."
- 
- sniffit: $(SNIFFIT) $(DEP_FILES)
--	cd libpcap; make; cd ..
- 	$(CC) $(EXE_FLAG) $(SNIFFIT) $(EXE_OBJ) $(EXE_OPT) $(LIBS) $(DEFS) $(OS_OPT) 
--	strip sniffit
- 
- sn_cfgfile.o: sn_cfgfile.h sn_cfgfile.c sn_defines.h sn_structs.h sn_config.h
- 	$(CC) $(OBJ_FLAG) sn_cfgfile.c $(OBJ_OPT) $(DEFS)
diff --git a/net-analyzer/sniffit/files/sniffit-0.3.7-gcc33.patch b/net-analyzer/sniffit/files/sniffit-0.3.7-gcc33.patch
deleted file mode 100644
index 5d39833d098d..000000000000
--- a/net-analyzer/sniffit/files/sniffit-0.3.7-gcc33.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr sniffit.0.3.7.beta/sn_structs.h sniffit.0.3.7.beta-gcc33/sn_structs.h
---- sniffit.0.3.7.beta/sn_structs.h	1998-07-16 12:17:10.000000000 -0400
-+++ sniffit.0.3.7.beta-gcc33/sn_structs.h	2003-07-26 11:53:46.229204088 -0400
-@@ -67,7 +67,7 @@
- struct snif_mask                                         /* struct for mask */
-   {
-   _32_bit source_ip, destination_ip;
--  _32_bit short source_port, destination_port;
-+  _32_bit source_port, destination_port;
-   };
- 
- /* (packet generation) */
diff --git a/net-analyzer/sniffit/files/sniffit-0.3.7-gentoo.patch b/net-analyzer/sniffit/files/sniffit-0.3.7-gentoo.patch
index 19a759578a43..c226b6f00d45 100644
--- a/net-analyzer/sniffit/files/sniffit-0.3.7-gentoo.patch
+++ b/net-analyzer/sniffit/files/sniffit-0.3.7-gentoo.patch
@@ -1,20 +1,29 @@
---- a/sniffit.0.3.7.beta/Makefile.in	2009-01-15 07:28:39.000000000 +0100
-+++ b/sniffit.0.3.7.beta/Makefile.in	2009-01-15 07:28:26.000000000 +0100
-@@ -10,9 +10,9 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -10,13 +10,13 @@
  LIBS       = @LIBS@
  DEFS	   = @DEFS@
  OS_OPT     = @OS_OPT@
 -OBJ_FLAG   = -w -O2 -c
-+OBJ_FLAG   = $(CFLAGS) -c
- OBJ_OPT    = -I./libpcap -L./libpcap
+-OBJ_OPT    = -I./libpcap -L./libpcap
 -EXE_FLAG   = -w -O2 -o sniffit
+-EXE_OPT    = -I./libpcap -L./libpcap -lpcap
++OBJ_FLAG   = $(CFLAGS) -c
++OBJ_OPT    = -I/usr/include/pcap -L/usr/lib
 +EXE_FLAG   = $(CFLAGS) $(LDFLAGS) -o sniffit
- EXE_OPT    = -I./libpcap -L./libpcap -lpcap
++EXE_OPT    = -I/usr/include/pcap -lpcap
  EXE_OBJ    = sn_packets.o sn_generation.o sn_interface.o sn_cfgfile.o \
               sn_logfile.o sn_resolv.o
-@@ -28,7 +28,6 @@
+-DEP_FILES  = sn_config.h ./libpcap/pcap.h sn_data.h sn_defines.h sn_plugins.h \
++DEP_FILES  = sn_config.h sn_data.h sn_defines.h sn_plugins.h \
+              sn_analyse.c sn_conn_desc.c \
+              sn_packets.o \
+              sn_generation.o sn_interface.o sn_cfgfile.o sn_logfile.o \
+@@ -26,9 +26,7 @@
+ 	@echo "Succesfull compilation..."
+ 
  sniffit: $(SNIFFIT) $(DEP_FILES)
- #	cd libpcap; make; cd ..
+-	cd libpcap; make; cd ..
  	$(CC) $(EXE_FLAG) $(SNIFFIT) $(EXE_OBJ) $(EXE_OPT) $(LIBS) $(DEFS) $(OS_OPT) 
 -	strip sniffit
  
diff --git a/net-analyzer/sniffit/files/sniffit-0.3.7-misc.patch b/net-analyzer/sniffit/files/sniffit-0.3.7-misc.patch
index aecf0da28050..ff84cd7d2259 100644
--- a/net-analyzer/sniffit/files/sniffit-0.3.7-misc.patch
+++ b/net-analyzer/sniffit/files/sniffit-0.3.7-misc.patch
@@ -1,12 +1,12 @@
---- a/sn_cfgfile.h	1998-07-16 18:17:10.000000000 +0200
-+++ b/sn_cfgfile.h	2010-09-16 18:14:53.000000000 +0200
+--- a/sn_cfgfile.h
++++ b/sn_cfgfile.h
 @@ -10,3 +10,4 @@
  void make_nr_dot (char *);
  void interprete_line (char *);
  void read_cfg_file (char *);    
 +char *strlower (char *);
---- a/sn_structs.h	1998-07-16 18:17:10.000000000 +0200
-+++ b/sn_structs.h	2010-09-16 18:14:53.000000000 +0200
+--- a/sn_structs.h
++++ b/sn_structs.h
 @@ -67,7 +67,7 @@
  struct snif_mask                                         /* struct for mask */
    {
@@ -16,8 +16,8 @@
    };
  
  /* (packet generation) */
---- a/sn_analyse.c	1998-07-16 18:17:10.000000000 +0200
-+++ b/sn_analyse.c	2010-09-16 18:14:53.000000000 +0200
+--- a/sn_analyse.c
++++ b/sn_analyse.c
 @@ -1,6 +1,9 @@
  /* Analyse traffic for logging mode                                      */
  /*   - by: Brecht Claerhout                                              */
@@ -28,8 +28,8 @@
  const unsigned char *data;
  memcpy(&tcphead,header,sizeof(struct TCP_header));
  	  	
---- a/sn_cfgfile.c	1998-07-16 18:17:10.000000000 +0200
-+++ b/sn_cfgfile.c	2010-09-16 18:14:53.000000000 +0200
+--- a/sn_cfgfile.c
++++ b/sn_cfgfile.c
 @@ -3,6 +3,11 @@
  /*   - improvements: Shudoh Kazuyuki                                      */
  
@@ -42,8 +42,8 @@
  #include <netdb.h>	                           /* for getservbyname() */
  
  #include "sn_config.h"
---- a/sn_conn_desc.c	1998-07-16 18:17:10.000000000 +0200
-+++ b/sn_conn_desc.c	2010-09-16 18:14:53.000000000 +0200
+--- a/sn_conn_desc.c
++++ b/sn_conn_desc.c
 @@ -1,6 +1,8 @@
  /* Connection description detection file                                 */
  /*   - by: Brecht Claerhout                                              */
@@ -53,8 +53,8 @@
  
  /* Simple PORT BASED detection */
  
---- a/sn_generation.c	1998-07-16 18:17:10.000000000 +0200
-+++ b/sn_generation.c	2010-09-16 18:18:31.000000000 +0200
+--- a/sn_generation.c
++++ b/sn_generation.c
 @@ -6,12 +6,16 @@
  #ifdef INCLUDE_INTERFACE
  #ifdef GENERATION
@@ -72,8 +72,8 @@
  
  extern volatile int screen_busy;
  
---- a/sniffit.0.3.7.c	1998-07-16 18:17:10.000000000 +0200
-+++ b/sniffit.0.3.7.c	2010-09-16 18:14:53.000000000 +0200
+--- a/sniffit.0.3.7.c
++++ b/sniffit.0.3.7.c
 @@ -4,6 +4,9 @@
  #include "sn_config.h"		/* Config header file */
  
@@ -84,8 +84,8 @@
  #include <signal.h>
  #include <stdio.h>
  #include <fcntl.h>
---- a/sn_interface.c	1998-07-16 18:17:10.000000000 +0200
-+++ b/sn_interface.c	2010-09-16 18:15:59.000000000 +0200
+--- a/sn_interface.c
++++ b/sn_interface.c
 @@ -6,6 +6,9 @@
  #ifdef INCLUDE_INTERFACE
  #include <signal.h>
@@ -96,8 +96,8 @@
  #include <sys/ipc.h>
  #include <sys/shm.h>       
  #include "sn_curses.h" 
---- a/sn_logfile.c	1998-07-16 18:17:10.000000000 +0200
-+++ b/sn_logfile.c	2010-09-16 18:16:44.000000000 +0200
+--- a/sn_logfile.c
++++ b/sn_logfile.c
 @@ -4,6 +4,9 @@
  #include "sn_config.h"
  
@@ -108,8 +108,8 @@
  #include <sys/stat.h>
  #include <sys/time.h>
  #include "sn_defines.h"
---- a/sn_packets.c	1998-07-16 18:17:10.000000000 +0200
-+++ b/sn_packets.c	2010-09-16 18:14:53.000000000 +0200
+--- a/sn_packets.c
++++ b/sn_packets.c
 @@ -5,6 +5,7 @@
  #include "sn_defines.h"
  #include "sn_structs.h"
diff --git a/net-analyzer/sniffit/files/sniffit-0.3.7-tinfo.patch b/net-analyzer/sniffit/files/sniffit-0.3.7-tinfo.patch
new file mode 100644
index 000000000000..b82835049687
--- /dev/null
+++ b/net-analyzer/sniffit/files/sniffit-0.3.7-tinfo.patch
@@ -0,0 +1,38 @@
+--- a/configure.in
++++ b/configure.in
+@@ -5,30 +5,15 @@
+ 
+ AC_INIT(sniffit.h)
+ 
+-dnl Config of libpcap
+-AC_CONFIG_SUBDIRS(libpcap)
+-
+ dnl Check the C compiler
+ AC_PROG_CC
+ 
+ dnl Check NCURSES availability
+-NCURSES_PATH=/usr/include:/usr/include/ncurses:/usr/include/curses:/usr/local/include:/usr/local/include/ncurses:/usr/local/include/curses:./:./ncurses.h
+-ncurses_warn=0
+-AC_CHECK_LIB(ncurses,main,,ncurses_warn=1)
+-
+-AC_PATH_PROGS(NCURSES_LOCATION,ncurses.h,no,$NCURSES_PATH)
+-if test "$NCURSES_LOCATION" != no; then
+-	echo "#include \"$NCURSES_LOCATION\"" >sn_curses.h
+-	AC_DEFINE(HAVE_NCURSES_H,1)
+-else
+-	ncurses_warn=1
+-fi
+-
+-dnl Print warning for interactive mode
+-if test $ncurses_warn -ne 0; then
+-        AC_MSG_WARN(Interactive mode (-i/-I) will NOT be supported.!)
+-	AC_MSG_WARN(Install ncurses!)       
+-fi
++PKG_CHECK_MODULES(ncurses,ncurses,main,
++	LIBS="$LIBS $ncurses_LIBS"
++	echo "#include <ncurses.h>" > sn_curses.h
++	AC_DEFINE(HAVE_NCURSES_H),
++	AC_MSG_ERROR([ncurses not found]))
+ 
+ dnl Check Shared Memory support
+ AC_CHECK_FUNCS(shmget)
diff --git a/net-analyzer/sniffit/metadata.xml b/net-analyzer/sniffit/metadata.xml
index 28cc2f1d0b06..03aa50bab7e3 100644
--- a/net-analyzer/sniffit/metadata.xml
+++ b/net-analyzer/sniffit/metadata.xml
@@ -2,5 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-<longdescription>Interactive Packet Sniffer</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/sniffit/sniffit-0.3.7-r1.ebuild b/net-analyzer/sniffit/sniffit-0.3.7-r1.ebuild
deleted file mode 100644
index 27e279f416a6..000000000000
--- a/net-analyzer/sniffit/sniffit-0.3.7-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sniffit/sniffit-0.3.7-r1.ebuild,v 1.11 2012/12/05 15:40:36 jer Exp $
-
-inherit eutils toolchain-funcs
-
-MY_P="${P/-/.}.beta"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Interactive Packet Sniffer"
-SRC_URI="http://reptile.rug.ac.be/~coder/sniffit/files/${MY_P}.tar.gz
-	 http://www.clan-tva.com/m0rpheus/sniffit_0.3.7.beta-10.diff"
-HOMEPAGE="http://reptile.rug.ac.be/~coder/sniffit/sniffit.html"
-
-DEPEND="net-libs/libpcap
-	>=sys-libs/ncurses-5.2"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-
-	cd ${S}
-	epatch ${DISTDIR}/sniffit_0.3.7.beta-10.diff
-
-	# Fix issues with gcc-3.3 (bug #25328)
-	epatch ${FILESDIR}/${P}-gcc33.patch
-	epatch ${FILESDIR}/${P}-gentoo.patch
-}
-
-src_compile() {
-	tc-export CC
-	econf || die
-	emake CFLAGS="${CFLAGS}" || die
-}
-
-src_install () {
-	dobin sniffit
-
-	doman sniffit.5 sniffit.8
-	dodoc README* PLUGIN-HOWTO BETA* HISTORY LICENSE
-}
diff --git a/net-analyzer/sniffit/sniffit-0.3.7-r3.ebuild b/net-analyzer/sniffit/sniffit-0.3.7-r3.ebuild
deleted file mode 100644
index 25af93f7ae34..000000000000
--- a/net-analyzer/sniffit/sniffit-0.3.7-r3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sniffit/sniffit-0.3.7-r3.ebuild,v 1.2 2012/12/05 15:40:36 jer Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-MY_P="${P/-/.}.beta"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Interactive Packet Sniffer"
-SRC_URI="http://reptile.rug.ac.be/~coder/${PN}/files/${MY_P}.tar.gz
-	 mirror://debian/pool/main/s/${PN}/${PN}_0.3.7.beta-15.diff.gz"
-HOMEPAGE="http://reptile.rug.ac.be/~coder/sniffit/sniffit.html"
-
-DEPEND="net-libs/libpcap
-	>=sys-libs/ncurses-5.2"
-RDEPEND="${DEPEND}"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-#S="${WORKDIR}"/${P/-/.}.beta
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-flags.patch \
-		"${FILESDIR}"/${P}-misc.patch
-}
-
-src_configure() {
-	tc-export CC
-	econf || die
-}
-
-src_install () {
-	dobin sniffit
-
-	doman sniffit.5 sniffit.8
-	dodoc README* PLUGIN-HOWTO BETA* HISTORY
-}
diff --git a/net-analyzer/sniffit/sniffit-0.3.7-r4.ebuild b/net-analyzer/sniffit/sniffit-0.3.7-r4.ebuild
index ed6422af6741..f224d6286c86 100644
--- a/net-analyzer/sniffit/sniffit-0.3.7-r4.ebuild
+++ b/net-analyzer/sniffit/sniffit-0.3.7-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 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/sniffit/sniffit-0.3.7-r4.ebuild,v 1.5 2013/02/06 19:50:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sniffit/sniffit-0.3.7-r4.ebuild,v 1.6 2014/07/17 02:15:28 jer Exp $
 
-EAPI=4
-inherit eutils toolchain-funcs
+EAPI=5
+inherit autotools eutils toolchain-funcs
 
 MY_P="${P/-/.}.beta"
 S="${WORKDIR}/${MY_P}"
@@ -11,21 +11,25 @@ DESCRIPTION="Interactive Packet Sniffer"
 SRC_URI="http://reptile.rug.ac.be/~coder/${PN}/files/${MY_P}.tar.gz"
 HOMEPAGE="http://reptile.rug.ac.be/~coder/sniffit/sniffit.html"
 
-DEPEND="net-libs/libpcap
-	>=sys-libs/ncurses-5.2"
-RDEPEND="${DEPEND}"
+RDEPEND="
+	net-libs/libpcap
+	>=sys-libs/ncurses-5.2
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
 
 SLOT="0"
 LICENSE="BSD"
 KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-#S="${WORKDIR}"/${P/-/.}.beta
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}"/${P}-flags.patch \
-		"${FILESDIR}"/${P}-misc.patch
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-misc.patch \
+		"${FILESDIR}"/${P}-tinfo.patch
+	eautoreconf
 	tc-export CC
 }