Bump deprecated EAPI. Clean up patches. Set *DEPEND straight.

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

5 files changed, 23 insertions, 19 deletions

diff --git a/net-analyzer/dhcpdump/ChangeLog b/net-analyzer/dhcpdump/ChangeLog
index 0722a389a469..b2daeb768c4d 100644
--- a/net-analyzer/dhcpdump/ChangeLog
+++ b/net-analyzer/dhcpdump/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/dhcpdump
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dhcpdump/ChangeLog,v 1.7 2013/07/01 13:44:47 zx2c4 Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dhcpdump/ChangeLog,v 1.8 2014/06/24 18:46:44 jer Exp $
+
+  24 Jun 2014; Jeroen Roovers <jer@gentoo.org> dhcpdump-1.8.ebuild,
+  files/dhcpdump-1.8-Makefile.patch, files/dhcpdump-1.8-debian.patch,
+  files/dhcpdump-1.8-endianness.patch:
+  Bump deprecated EAPI. Clean up patches. Set *DEPEND straight.
 
   01 Jul 2013; Jason A. Donenfeld <zx2c4@gentoo.org>
   +files/dhcpdump-1.8-endianness.patch, dhcpdump-1.8.ebuild:
diff --git a/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild b/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild
index 5d3404460708..7b589c6f9cdc 100644
--- a/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild
+++ b/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild
@@ -1,7 +1,8 @@
-# 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/dhcpdump/dhcpdump-1.8.ebuild,v 1.3 2013/07/01 13:44:47 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild,v 1.4 2014/06/24 18:46:44 jer Exp $
 
+EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="DHCP Packet Analyzer/tcpdump postprocessor"
@@ -11,22 +12,21 @@ SRC_URI="http://www.mavetju.org/download/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64 ~mips"
-IUSE=""
 
-CDEPEND="net-libs/libpcap"
-DEPEND="dev-lang/perl"
-RDEPEND="${CDEPEND}"
+RDEPEND="net-libs/libpcap"
+DEPEND="
+	${RDEPEND}
+	dev-lang/perl
+"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-Makefile.patch
 	epatch "${FILESDIR}"/${P}-debian.patch
 	epatch "${FILESDIR}"/${P}-endianness.patch
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) || die "emake failed"
+	emake CC=$(tc-getCC)
 }
 
 src_install () {
diff --git a/net-analyzer/dhcpdump/files/dhcpdump-1.8-Makefile.patch b/net-analyzer/dhcpdump/files/dhcpdump-1.8-Makefile.patch
index d089fe3da04b..690f60779b87 100644
--- a/net-analyzer/dhcpdump/files/dhcpdump-1.8-Makefile.patch
+++ b/net-analyzer/dhcpdump/files/dhcpdump-1.8-Makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2008-06-24 05:26:52.000000000 +0200
-+++ Makefile	2008-10-26 01:22:32.000000000 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -1,6 +1,6 @@
 -CFLAGS=	 -Wall -g
 -LDFLAGS= -g
diff --git a/net-analyzer/dhcpdump/files/dhcpdump-1.8-debian.patch b/net-analyzer/dhcpdump/files/dhcpdump-1.8-debian.patch
index a5882df76f7a..7c5304bb0bca 100644
--- a/net-analyzer/dhcpdump/files/dhcpdump-1.8-debian.patch
+++ b/net-analyzer/dhcpdump/files/dhcpdump-1.8-debian.patch
@@ -1,5 +1,5 @@
---- dhcpdump-1.8.orig/dhcpdump.c
-+++ dhcpdump-1.8/dhcpdump.c
+--- a/dhcpdump.c
++++ b/dhcpdump.c
 @@ -16,11 +16,13 @@
  #include <netinet/in.h>
  #include <netinet/ip.h>
diff --git a/net-analyzer/dhcpdump/files/dhcpdump-1.8-endianness.patch b/net-analyzer/dhcpdump/files/dhcpdump-1.8-endianness.patch
index c0dc2f6a9467..2a6f7822c2b3 100644
--- a/net-analyzer/dhcpdump/files/dhcpdump-1.8-endianness.patch
+++ b/net-analyzer/dhcpdump/files/dhcpdump-1.8-endianness.patch
@@ -1,6 +1,5 @@
-diff -ru dhcpdump-1.8/dhcpdump.c dhcpdump-1.8-modified/dhcpdump.c
---- dhcpdump-1.8/dhcpdump.c	2008-06-24 05:26:52.000000000 +0200
-+++ dhcpdump-1.8-modified/dhcpdump.c	2013-07-01 15:31:04.260609883 +0200
+--- a/dhcpdump.c
++++ b/dhcpdump.c
 @@ -130,7 +130,7 @@
  	offset += ETHER_HDR_LEN;