gentoo resync : 04.01.2018

5 files changed, 31 insertions, 23 deletions

diff --git a/net-misc/arpd/Manifest b/net-misc/arpd/Manifest
index 5aced71d2b5e..809e6383c0bf 100644
--- a/net-misc/arpd/Manifest
+++ b/net-misc/arpd/Manifest
@@ -1,6 +1,6 @@
-AUX arpd-0.2-buildsystem-libevent-test.patch 446 BLAKE2B 110e37130b2977927689f115fc4d484d5f89438e1df54c6d43b889608495e3eab27e33e0eafe79857279c4365671b8d3e200e5fcb30bad0dc8d6c9d3987626d9 SHA512 391ad8f47d4f921d65eca692e70706c08804c1af65d779946bae8a520b6165921c0c3bd5e95a19ed078ffc7771f1b7247fce8d9e229834de2a0920853dbd0874
-AUX arpd-0.2-libevent.patch 506 BLAKE2B c02b7db79dc606e1946b09c24568d2a842d143f0febf216ee282f602ea4ae567c3818ae82b7c8e15b42780556d0accf9263d73d7c1776b3487ad543c50ab8123 SHA512 2b67af23366ed32a7354db84d372f1491571171b9b017d6c4eb3c52bc465fa9b5c1763327a5b99b69d89c46efab42590fcfc928442bd142485853cb0bbea7091
-AUX arpd.c.patch 1477 BLAKE2B e0ca4db2ed0fe688229f99844796b07eed0f0d0faed813d10143744a75d13cd93fa297e9ddd1573955485b4c90225b635950905d051a24ba198b765c14d61384 SHA512 04ef9a49ddeca1543a8098b499c26cfea4ba470d488a92d33ccaded9dcfe0a2e1f01de2596ae0fe1e220f73ceed54fbcea20024152ce886d65af560234bb21a4
+AUX arpd-0.2-buildsystem-libevent-test.patch 373 BLAKE2B acbb6c7865e032feb87451829322faf5061cbe3387ad15334f86031a4ff103766bb22c99547022f80c87f06ff53a6a95f3cceb2b4adb41d90b56b9c2e5ef6c50 SHA512 c990409996167538fd449bd70a102767f1db217f709b33cba4b7f27d8829d77246c354790820f0195ea0975ae730f4a6ac30e17e5bb7d22e1805f65ef247d14e
+AUX arpd-0.2-libevent.patch 423 BLAKE2B 834691198e97f8018a0861ac2938b60840dacb5de3ac2ad5d1a632b94f1582a761e326ddca0bdd0cfc7f245a6c9cfe2ac5601382721c8471dd546b80ac1cec2d SHA512 2bcb236d138fff6433da7385a309e09eea583ee295ddacbadae7bd562b6df972ef0a45636b61dd72f62b375fa08382b9e82b62b220fa351b178b70571c1d86ae
+AUX arpd.c.patch 1404 BLAKE2B 9dbae33986d92a0d220baf428cedc24bf1ffb3a3b41edeb8ebaad68d5c60752d1c16902a32ec314b59baf7b9bb5d9ece35b1adc0af5e67f6173bc47741e97eee SHA512 f9a5669525ed2081a47025206fed6b016ef4a7d35b10b2c8a7c7135b0b7eddf060e380a7561c59d23466065614c1d9287cffc3158cb05ad1907fc6ea569def28
 DIST arpd-0.2.tar.gz 49437 BLAKE2B 6739954b5cb1da3d23251b526c5bc39b1563f6d54e74e5ff8d8e9c3f9b0ed1ecedc7caf805e51321849036d3dc49ab2e7f244599c7c2ef2b02d65160a8cf669c SHA512 24bd4626188d74e172a46312790f8453619af2ac634c23379d1922c789ed97ef5db8a73ae13fccd98c94457da79682d6a1d7ccc3236c787f9d2eb15f64716ea2
-EBUILD arpd-0.2-r1.ebuild 940 BLAKE2B 12af202a7bdc0910569d684cf05ecc9c382c84544efdf72ba4360959eeb62cce3e7e5cce7bbb0aa8d3b61f53b96da4cc517b4ff913a5f8d5f3337a7075d10512 SHA512 3d3315ad473ed88f20b788b290c2e04f142dc317489142db4cd35ad4b75efd034c6cc6617e234a97d09e1dfb86099a8313a329471efabe3f9440cc755891c327
+EBUILD arpd-0.2-r1.ebuild 966 BLAKE2B 820cd8579f7e9b0be6c7b7b3673bb02722c8337942924d5a4ba89cb9885e25acabb9ccb7b540242dc44c34babe61c84e399d26972704d5a78da270b9d5af2444 SHA512 8487cd545b486bb67ccd73795e09d17eec84d06ecbd3b02430c2ba704cbfbbad80f2a0817b2c756a7ac8a993a8ad35f88b0da304990a20083423e745a1be7aa2
 MISC metadata.xml 243 BLAKE2B f6898ed42cda5e8c4bb81d5737f88ff6118fe3507e7ddcebf4686fa26effb75d03176ee091289e1011788f1a98cab52d5374e29dc04c2c298112c47a2c336f02 SHA512 efed1be9deecfbfc884a140e4ecb918eb473ec755a7910ab9afd29fa236d3c34c09c8d11454a0f8c26331539cbad1461f4824ff348b7fb7335cc88fb51d3882b
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);