1 |
commit: 33de123e3f1b41bd30750e79f16909001f6a67cc |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 3 18:37:41 2018 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 3 18:37:41 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33de123e |
7 |
|
8 |
net-misc/arpd: Port to EAPI 6 |
9 |
|
10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
11 |
|
12 |
net-misc/arpd/arpd-0.2-r1.ebuild | 34 +++++++++++++--------- |
13 |
.../files/arpd-0.2-buildsystem-libevent-test.patch | 4 +-- |
14 |
net-misc/arpd/files/arpd-0.2-libevent.patch | 4 +-- |
15 |
net-misc/arpd/files/arpd.c.patch | 4 +-- |
16 |
4 files changed, 27 insertions(+), 19 deletions(-) |
17 |
|
18 |
diff --git a/net-misc/arpd/arpd-0.2-r1.ebuild b/net-misc/arpd/arpd-0.2-r1.ebuild |
19 |
index 788d227dc62..bd8fb5f5f32 100644 |
20 |
--- a/net-misc/arpd/arpd-0.2-r1.ebuild |
21 |
+++ b/net-misc/arpd/arpd-0.2-r1.ebuild |
22 |
@@ -1,11 +1,11 @@ |
23 |
-# Copyright 1999-2014 Gentoo Foundation |
24 |
+# Copyright 1999-2018 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
|
27 |
-EAPI="3" |
28 |
+EAPI=6 |
29 |
|
30 |
-inherit autotools eutils |
31 |
+inherit autotools |
32 |
|
33 |
-DESCRIPTION="ARP server which claims all unassigned addresses (for network monitoring or simulation)" |
34 |
+DESCRIPTION="ARP server claiming all unassigned addresses (for network monitoring/simulation)" |
35 |
HOMEPAGE="http://www.citi.umich.edu/u/provos/honeyd/" |
36 |
SRC_URI="http://www.citi.umich.edu/u/provos/honeyd/${P}.tar.gz" |
37 |
|
38 |
@@ -14,28 +14,36 @@ SLOT="0" |
39 |
KEYWORDS="amd64 hppa ppc ~ppc64 sparc x86" |
40 |
IUSE="" |
41 |
|
42 |
-DEPEND=">=dev-libs/libdnet-1.4 |
43 |
+DEPEND=" |
44 |
+ >=dev-libs/libdnet-1.4 |
45 |
>=dev-libs/libevent-0.6 |
46 |
net-libs/libpcap |
47 |
!sys-apps/iproute2" |
48 |
+RDEPEND="${DEPEND}" |
49 |
|
50 |
S=${WORKDIR}/${PN} |
51 |
|
52 |
-src_prepare() { |
53 |
- epatch "${FILESDIR}"/arpd.c.patch |
54 |
- epatch "${FILESDIR}"/${P}-libevent.patch |
55 |
+PATCHES=( |
56 |
+ "${FILESDIR}"/arpd.c.patch |
57 |
+ "${FILESDIR}"/${P}-libevent.patch |
58 |
|
59 |
- #fix bug 337481, replace test on libevent.a with libevent.so |
60 |
- epatch "${FILESDIR}"/${P}-buildsystem-libevent-test.patch |
61 |
+ # bug 337481, replace test on libevent.a with libevent.so |
62 |
+ "${FILESDIR}"/${P}-buildsystem-libevent-test.patch |
63 |
+) |
64 |
|
65 |
+src_prepare() { |
66 |
+ default |
67 |
+ mv configure.{in,ac} || die |
68 |
eautoreconf |
69 |
} |
70 |
|
71 |
src_configure() { |
72 |
- econf --with-libdnet="${EPREFIX}"/usr --with-libevent="${EPREFIX}"/usr |
73 |
+ econf \ |
74 |
+ --with-libdnet="${EPREFIX}"/usr \ |
75 |
+ --with-libevent="${EPREFIX}"/usr |
76 |
} |
77 |
|
78 |
src_install() { |
79 |
- dosbin arpd || die |
80 |
- doman arpd.8 || die |
81 |
+ dosbin arpd |
82 |
+ doman arpd.8 |
83 |
} |
84 |
|
85 |
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 |
86 |
index c0c0f47712a..598fd0b7377 100644 |
87 |
--- a/net-misc/arpd/files/arpd-0.2-buildsystem-libevent-test.patch |
88 |
+++ b/net-misc/arpd/files/arpd-0.2-buildsystem-libevent-test.patch |
89 |
@@ -1,5 +1,5 @@ |
90 |
---- configure.in.orig 2003-02-09 19:30:33.000000000 +0100 |
91 |
-+++ configure.in 2010-09-17 00:33:36.138294836 +0200 |
92 |
+--- a/configure.in |
93 |
++++ b/configure.in |
94 |
@@ -62,7 +62,7 @@ |
95 |
;; |
96 |
*) |
97 |
|
98 |
diff --git a/net-misc/arpd/files/arpd-0.2-libevent.patch b/net-misc/arpd/files/arpd-0.2-libevent.patch |
99 |
index 2d5998f8c8d..367ae551ad9 100644 |
100 |
--- a/net-misc/arpd/files/arpd-0.2-libevent.patch |
101 |
+++ b/net-misc/arpd/files/arpd-0.2-libevent.patch |
102 |
@@ -1,5 +1,5 @@ |
103 |
---- arpd.orig/arpd.c 2010-02-03 20:03:07.098748175 +0100 |
104 |
-+++ arpd/arpd.c 2010-02-03 20:06:24.469749941 +0100 |
105 |
+--- a/arpd.c |
106 |
++++ b/arpd.c |
107 |
@@ -445,9 +445,6 @@ |
108 |
void |
109 |
terminate_handler(int sig) |
110 |
|
111 |
diff --git a/net-misc/arpd/files/arpd.c.patch b/net-misc/arpd/files/arpd.c.patch |
112 |
index 732ed16c92d..b8d2bbdb94b 100644 |
113 |
--- a/net-misc/arpd/files/arpd.c.patch |
114 |
+++ b/net-misc/arpd/files/arpd.c.patch |
115 |
@@ -1,5 +1,5 @@ |
116 |
---- arpd.c.orig 2005-03-30 15:13:37.136590624 -0700 |
117 |
-+++ arpd.c 2005-03-30 15:23:50.295231384 -0700 |
118 |
+--- a/arpd.c |
119 |
++++ b/arpd.c |
120 |
@@ -265,7 +265,7 @@ |
121 |
spa->addr_ip, tha->addr_eth, tpa->addr_ip); |