net-misc/arpd: Port to EAPI 6

Package-Manager: Portage-2.3.19, Repoman-2.3.6

4 files changed, 27 insertions, 19 deletions

diff --git a/net-misc/arpd/arpd-0.2-r1.ebuild b/net-misc/arpd/arpd-0.2-r1.ebuild
index 788d227dc629..bd8fb5f5f32d 100644
--- a/net-misc/arpd/arpd-0.2-r1.ebuild
+++ b/net-misc/arpd/arpd-0.2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="3"
+EAPI=6
 
-inherit autotools eutils
+inherit autotools
 
-DESCRIPTION="ARP server which claims all unassigned addresses (for network monitoring or simulation)"
+DESCRIPTION="ARP server claiming all unassigned addresses (for network monitoring/simulation)"
 HOMEPAGE="http://www.citi.umich.edu/u/provos/honeyd/"
 SRC_URI="http://www.citi.umich.edu/u/provos/honeyd/${P}.tar.gz"
 
@@ -14,28 +14,36 @@ SLOT="0"
 KEYWORDS="amd64 hppa ppc ~ppc64 sparc x86"
 IUSE=""
 
-DEPEND=">=dev-libs/libdnet-1.4
+DEPEND="
+	>=dev-libs/libdnet-1.4
 	>=dev-libs/libevent-0.6
 	net-libs/libpcap
 	!sys-apps/iproute2"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${PN}
 
-src_prepare() {
-	epatch "${FILESDIR}"/arpd.c.patch
-	epatch "${FILESDIR}"/${P}-libevent.patch
+PATCHES=(
+	"${FILESDIR}"/arpd.c.patch
+	"${FILESDIR}"/${P}-libevent.patch
 
-	#fix bug 337481, replace test on libevent.a with libevent.so
-	epatch "${FILESDIR}"/${P}-buildsystem-libevent-test.patch
+	# bug 337481, replace test on libevent.a with libevent.so
+	"${FILESDIR}"/${P}-buildsystem-libevent-test.patch
+)
 
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
 src_configure() {
-	econf --with-libdnet="${EPREFIX}"/usr --with-libevent="${EPREFIX}"/usr
+	econf \
+		--with-libdnet="${EPREFIX}"/usr \
+		--with-libevent="${EPREFIX}"/usr
 }
 
 src_install() {
-	dosbin arpd || die
-	doman arpd.8 || die
+	dosbin arpd
+	doman arpd.8
 }
diff --git a/net-misc/arpd/files/arpd-0.2-buildsystem-libevent-test.patch b/net-misc/arpd/files/arpd-0.2-buildsystem-libevent-test.patch
index c0c0f47712a8..598fd0b73777 100644
--- a/net-misc/arpd/files/arpd-0.2-buildsystem-libevent-test.patch
+++ b/net-misc/arpd/files/arpd-0.2-buildsystem-libevent-test.patch
@@ -1,5 +1,5 @@
---- configure.in.orig	2003-02-09 19:30:33.000000000 +0100
-+++ configure.in	2010-09-17 00:33:36.138294836 +0200
+--- a/configure.in
++++ b/configure.in
 @@ -62,7 +62,7 @@
       ;;
    *)
diff --git a/net-misc/arpd/files/arpd-0.2-libevent.patch b/net-misc/arpd/files/arpd-0.2-libevent.patch
index 2d5998f8c8d3..367ae551ad98 100644
--- a/net-misc/arpd/files/arpd-0.2-libevent.patch
+++ b/net-misc/arpd/files/arpd-0.2-libevent.patch
@@ -1,5 +1,5 @@
---- arpd.orig/arpd.c	2010-02-03 20:03:07.098748175 +0100
-+++ arpd/arpd.c	2010-02-03 20:06:24.469749941 +0100
+--- a/arpd.c
++++ b/arpd.c
 @@ -445,9 +445,6 @@
  void
  terminate_handler(int sig)
diff --git a/net-misc/arpd/files/arpd.c.patch b/net-misc/arpd/files/arpd.c.patch
index 732ed16c92d7..b8d2bbdb94b0 100644
--- a/net-misc/arpd/files/arpd.c.patch
+++ b/net-misc/arpd/files/arpd.c.patch
@@ -1,5 +1,5 @@
---- arpd.c.orig	2005-03-30 15:13:37.136590624 -0700
-+++ arpd.c	2005-03-30 15:23:50.295231384 -0700
+--- a/arpd.c
++++ b/arpd.c
 @@ -265,7 +265,7 @@
  	    spa->addr_ip, tha->addr_eth, tpa->addr_ip);