EAPI bump. Clean up patches.

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

5 files changed, 21 insertions, 66 deletions

diff --git a/net-analyzer/fprobe/ChangeLog b/net-analyzer/fprobe/ChangeLog
index 5ee82b437779..bb4c0b02c80a 100644
--- a/net-analyzer/fprobe/ChangeLog
+++ b/net-analyzer/fprobe/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/fprobe
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fprobe/ChangeLog,v 1.15 2008/08/04 19:28:41 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fprobe/ChangeLog,v 1.16 2014/07/11 12:55:05 jer Exp $
+
+  11 Jul 2014; Jeroen Roovers <jer@gentoo.org> -fprobe-1.1-r1.ebuild,
+  fprobe-1.1-r2.ebuild, files/fprobe-1.1-pidfile-sanity.patch,
+  files/fprobe-1.1-setgroups.patch:
+  EAPI bump. Clean up patches.
 
   04 Aug 2008; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Describe local USE flags for GLEP 56.
diff --git a/net-analyzer/fprobe/files/fprobe-1.1-pidfile-sanity.patch b/net-analyzer/fprobe/files/fprobe-1.1-pidfile-sanity.patch
index e7c10bd98d0d..c58c2a97c002 100644
--- a/net-analyzer/fprobe/files/fprobe-1.1-pidfile-sanity.patch
+++ b/net-analyzer/fprobe/files/fprobe-1.1-pidfile-sanity.patch
@@ -6,9 +6,8 @@ unfortunetly.
 
 Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
 
-diff -Nuar fprobe-1.1.orig/src/fprobe.c fprobe-1.1/src/fprobe.c
---- fprobe-1.1.orig/src/fprobe.c	2005-01-30 08:43:35.000000000 +0000
-+++ fprobe-1.1/src/fprobe.c	2008-03-16 20:51:24.000000000 +0000
+--- a/src/fprobe.c
++++ b/src/fprobe.c
 @@ -1379,7 +1379,8 @@
  
  	my_log_open(ident, verbosity, log_dest);
diff --git a/net-analyzer/fprobe/files/fprobe-1.1-setgroups.patch b/net-analyzer/fprobe/files/fprobe-1.1-setgroups.patch
index 969681243788..803a2a9ce43a 100644
--- a/net-analyzer/fprobe/files/fprobe-1.1-setgroups.patch
+++ b/net-analyzer/fprobe/files/fprobe-1.1-setgroups.patch
@@ -2,9 +2,8 @@ This seems to fail after the chroot(), so just squelch the exit for now.
 
 Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
 
-diff -Nuar fprobe-1.1/src/fprobe.c fprobe-1.1.new/src/fprobe.c
---- fprobe-1.1/src/fprobe.c	2008-03-17 00:06:43.000000000 +0000
-+++ fprobe-1.1.new/src/fprobe.c	2008-03-17 00:07:30.000000000 +0000
+--- a/src/fprobe.c
++++ b/src/fprobe.c
 @@ -1541,10 +1541,10 @@
  	}
  
diff --git a/net-analyzer/fprobe/fprobe-1.1-r1.ebuild b/net-analyzer/fprobe/fprobe-1.1-r1.ebuild
deleted file mode 100644
index 7e8e864d92be..000000000000
--- a/net-analyzer/fprobe/fprobe-1.1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fprobe/fprobe-1.1-r1.ebuild,v 1.2 2008/03/17 17:18:41 mr_bones_ Exp $
-
-inherit eutils
-
-DESCRIPTION="A libpcap-based tool to collect network traffic data and emit it as NetFlow flows"
-HOMEPAGE="http://fprobe.sourceforge.net"
-LICENSE="GPL-2"
-
-SRC_URI="mirror://sourceforge/fprobe/${P}.tar.bz2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="debug messages"
-
-DEPEND="net-libs/libpcap"
-
-src_unpack() {
-	unpack ${A}
-	# The pidfile should be created by the parent process, before the
-	# setuid/chroot # is executed.
-	epatch "${FILESDIR}"/fprobe-1.1-pidfile-sanity.patch
-	# This seems to fail, uncertain why.
-	epatch "${FILESDIR}"/fprobe-1.1-setgroups.patch
-}
-
-src_compile() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable messages) \
-		|| die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-
-	dodoc AUTHORS NEWS README TODO
-	docinto contrib
-	dodoc contrib/tg.sh
-
-	newinitd "${FILESDIR}"/init.d-fprobe fprobe
-	newconfd "${FILESDIR}"/conf.d-fprobe fprobe
-}
diff --git a/net-analyzer/fprobe/fprobe-1.1-r2.ebuild b/net-analyzer/fprobe/fprobe-1.1-r2.ebuild
index a56046d86acc..d79eb1353995 100644
--- a/net-analyzer/fprobe/fprobe-1.1-r2.ebuild
+++ b/net-analyzer/fprobe/fprobe-1.1-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 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/fprobe/fprobe-1.1-r2.ebuild,v 1.1 2008/06/26 20:41:24 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fprobe/fprobe-1.1-r2.ebuild,v 1.2 2014/07/11 12:55:05 jer Exp $
 
+EAPI=5
 inherit eutils
 
 DESCRIPTION="A libpcap-based tool to collect network traffic data and emit it as NetFlow flows"
@@ -16,28 +17,25 @@ IUSE="debug messages"
 
 DEPEND="net-libs/libpcap"
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
 	# The pidfile should be created by the parent process, before the
-	# setuid/chroot # is executed.
+	# setuid/chroot is executed.
 	epatch "${FILESDIR}"/fprobe-1.1-pidfile-sanity.patch
 	# This seems to fail, uncertain why.
 	epatch "${FILESDIR}"/fprobe-1.1-setgroups.patch
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		$(use_enable debug) \
-		$(use_enable messages) \
-		|| die "configure failed"
-
-	emake || die "make failed"
+		$(use_enable messages)
 }
 
+DOCS=( AUTHORS NEWS README TODO )
+
 src_install() {
-	make DESTDIR="${D}" install || die "install failed"
+	default
 
-	dodoc AUTHORS NEWS README TODO
 	docinto contrib
 	dodoc contrib/tg.sh