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

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

10 files changed, 101 insertions, 172 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/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
 }