EAPI bump. Fix compiler warning. Convert sed scripts to patches. Remove short <longdescription>.

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

5 files changed, 82 insertions, 21 deletions

diff --git a/net-analyzer/siphon/ChangeLog b/net-analyzer/siphon/ChangeLog
index bbfd592d810c..939ec2b1bd9f 100644
--- a/net-analyzer/siphon/ChangeLog
+++ b/net-analyzer/siphon/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/siphon
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/siphon/ChangeLog,v 1.19 2012/12/05 16:28:50 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/siphon/ChangeLog,v 1.20 2014/07/17 01:09:22 jer Exp $
+
+  17 Jul 2014; Jeroen Roovers <jer@gentoo.org> siphon-666-r1.ebuild,
+  +files/siphon-666-gentoo.patch, +files/siphon-666-log.patch, metadata.xml:
+  EAPI bump. Fix compiler warning. Convert sed scripts to patches. Remove short
+  <longdescription>.
 
   05 Dec 2012; Jeroen Roovers <jer@gentoo.org> -siphon-666.ebuild,
   siphon-666-r1.ebuild:
diff --git a/net-analyzer/siphon/files/siphon-666-gentoo.patch b/net-analyzer/siphon/files/siphon-666-gentoo.patch
new file mode 100644
index 000000000000..eea6d93b802e
--- /dev/null
+++ b/net-analyzer/siphon/files/siphon-666-gentoo.patch
@@ -0,0 +1,19 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,6 +1,6 @@
+ CC = gcc
+ CCFLAGS = -Wall -pthread -ggdb
+-CFLAGS = -Wall -O2 -pthread -ggdb -I. 
++CFLAGS += -pthread -Wall -I.
+ LIBS = -lpcap
+ OBJS = parse.o sniff.o main.o log.o
+ SRCS = ${OBJS:.o=.c}
+@@ -9,7 +9,7 @@
+ all: $(TARGET)
+ 
+ $(TARGET): $(OBJS)
+-	$(CC) $(CCFLAGS) -o $(TARGET) $(OBJS) $(LIBS)
++	$(CC) $(CCFLAGS) $(LDFLAGS) -o $(TARGET) $(OBJS) $(LIBS)
+ 
+ clean:
+ 	rm -f $(OBJS) *~ *.core core siphon
diff --git a/net-analyzer/siphon/files/siphon-666-log.patch b/net-analyzer/siphon/files/siphon-666-log.patch
new file mode 100644
index 000000000000..07d2de4d4d12
--- /dev/null
+++ b/net-analyzer/siphon/files/siphon-666-log.patch
@@ -0,0 +1,46 @@
+--- a/main.c
++++ b/main.c
+@@ -98,7 +98,7 @@
+    pti_parse.pti_pd[1] = pd_parse2log[1];
+ 
+    pthread_create (&parse_thread, NULL, (void *) parse, &pti_parse);
+-   pthread_create(&log_thread,NULL,(void *)log, (void *)pd_parse2log[0]);
++   pthread_create(&log_thread,NULL,(void *)siphon_log, (void *)pd_parse2log[0]);
+    pthread_create (&sniff_thread, NULL, (void *) sniff_network,
+ 		   &pd_sniff2parse[1]);
+ 
+--- a/log.c
++++ b/log.c
+@@ -19,7 +19,7 @@
+ 
+ int tag = 0;
+ 
+-void *log(void *pipe)
++void *siphon_log(void *pipe)
+ {
+   struct parse2log *info;
+   char hashed[100], buf[1024], *os, *proto = NULL, *df;
+@@ -137,10 +137,10 @@
+   FILE *osprints;
+   static char line[80], *oswin, *osttl, *osdf, *os, hexed[10];
+   static int check = 0;
+-  osprints = fopen("osprints.conf","r");
++  osprints = fopen("/etc/osprints.conf","r");
+ 
+   if(!osprints) {
+-    perror("Unable to find osprints.conf\n");
++    perror("Unable to find /etc/osprints.conf\n");
+     return "Unknown";
+   }
+ 
+--- a/siphon.h
++++ b/siphon.h
+@@ -49,7 +49,7 @@
+ 
+ void *sniff_network (void *);
+ void *parse (void *);
+-void *log(void *);
++void *siphon_log(void *);
+ 
+ char *device, *logfile;
+ int verbose, back;
diff --git a/net-analyzer/siphon/metadata.xml b/net-analyzer/siphon/metadata.xml
index 7b7dc6840d0c..03aa50bab7e3 100644
--- a/net-analyzer/siphon/metadata.xml
+++ b/net-analyzer/siphon/metadata.xml
@@ -2,5 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-<longdescription>A portable passive network mapping suite</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/siphon/siphon-666-r1.ebuild b/net-analyzer/siphon/siphon-666-r1.ebuild
index 62028cb36f6f..c9714eb29b04 100644
--- a/net-analyzer/siphon/siphon-666-r1.ebuild
+++ b/net-analyzer/siphon/siphon-666-r1.ebuild
@@ -1,43 +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/siphon/siphon-666-r1.ebuild,v 1.5 2012/12/05 16:28:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/siphon/siphon-666-r1.ebuild,v 1.6 2014/07/17 01:09:22 jer Exp $
 
-EAPI="2"
-
-inherit toolchain-funcs
+EAPI=5
+inherit eutils toolchain-funcs
 
 MY_P=${PN}-v.${PV}
 
 DESCRIPTION="A portable passive network mapping suite"
-SRC_URI="http://siphon.datanerds.net/${MY_P}.tar.gz"
 HOMEPAGE="http://siphon.datanerds.net/"
-
-SLOT="0"
+SRC_URI="${HOMEPAGE}${MY_P}.tar.gz"
 LICENSE="BSD"
+SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
 
 DEPEND="net-libs/libpcap"
 RDEPEND="${DEPEND}"
-IUSE=""
 
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
-	sed -i log.c \
-		-e 's:osprints\.conf:/etc/osprints.conf:' \
-		|| die "sed log.c"
-	sed -i Makefile \
-		-e '/^CFLAGS/s:=.*:+= -pthread -Wall -I.:g' \
-		-e 's: -o : $(LDFLAGS)&:g' \
-		|| die "sed Makefile"
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-log.patch
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) || die
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
-	dobin ${PN} || die "dobin ${PN}"
+	dobin ${PN}
 	insinto /etc
 	doins osprints.conf
 	dodoc README