Fix libevent test in configure.in

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

5 files changed, 28 insertions, 22 deletions

diff --git a/net-misc/arpd/ChangeLog b/net-misc/arpd/ChangeLog
index fbcc00c63ad9..b1861aac348b 100644
--- a/net-misc/arpd/ChangeLog
+++ b/net-misc/arpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/arpd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/arpd/ChangeLog,v 1.14 2010/02/16 21:08:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/arpd/ChangeLog,v 1.15 2010/09/16 22:47:15 xmw Exp $
+
+  16 Sep 2010; Michael Weber <xmw@gentoo.org> arpd-0.2-r1.ebuild,
+  +files/arpd-0.2-buildsystem-libevent-test.patch, metadata.xml:
+  Taking maintainership. Fix libevent test in configure.in (bug #337481).
 
 *arpd-0.2-r1 (16 Feb 2010)
 
diff --git a/net-misc/arpd/Manifest b/net-misc/arpd/Manifest
index eebbe0b23639..164c8065f6a3 100644
--- a/net-misc/arpd/Manifest
+++ b/net-misc/arpd/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX arpd-0.2-buildsystem-libevent-test.patch 446 RMD160 c8299ab8a93ef34c8e66a8d092f1dfe599498a35 SHA1 38d681be414cb2b351e5f2c488dcda5b60712e27 SHA256 121094275b09266409ba29efda150c9acd0e8d840c0d099ba0cdd8390ed98d8a
 AUX arpd-0.2-libevent.patch 506 RMD160 74f0939f8991b2c6cb9a804c69498a365e4c821b SHA1 c7874783116b906cd0d0f573a2f2ac56cf3d4cee SHA256 bb8baa1df8f6bf4b019875e27fc6f8e9f0599f0bbfb37ba7749503b3dd897187
 AUX arpd.c.patch 1477 RMD160 1fcf7dea74139ff11e12604f78e99459838af743 SHA1 29125936888d08376c4cf7f74bb89e3b9110ffeb SHA256 d193c5216b3c39741d6c00180d641471be9c80c68cc6a2100412671ae5e8627a
 DIST arpd-0.2.tar.gz 49437 RMD160 777ef6789e2882cf0e0958951377f65f6362d816 SHA1 e827ada394aff91f9c539cee35e946e81152426c SHA256 21d55de1506b3dbbfddb1b57e782a5fbf7140d299fbb08f4a8e48daaaa8489e7
-EBUILD arpd-0.2-r1.ebuild 1109 RMD160 ecac9767ec7f2364476b8f9557e9c0432bcc1a63 SHA1 69d8e165df86c432ad7f08dee416c7f174bf7750 SHA256 ed335c09a6db7b084ac0b382a4fcc1b6dfe5a8455f528dc029018bde0f81b4a1
+EBUILD arpd-0.2-r1.ebuild 1043 RMD160 adb6dea2b2fa91b9bec99ce535d81d0e406f4d8a SHA1 5ebe73ffc06060303986c62ff278f5ab04bd88eb SHA256 769e520b4fb0a20730ef2ca27dc608927273337df86e7ee6f3a69909a4db4378
 EBUILD arpd-0.2.ebuild 1084 RMD160 1d30086e794b770c4d6eec60659ace8496b2e3c1 SHA1 8f2ae8f76887f5207af086fff69e8ba3ea78e18d SHA256 3ab185d9bd6e23eea1cde6b6579c16081e69457e872e8e9338ee8cff039f4157
-MISC ChangeLog 1720 RMD160 d8c76e4d6056d9ce98b907fb8f8d8db4d545bf52 SHA1 e61d3d4a7e8db1cffe6d81c15fb1b989ed300101 SHA256 349635072c83d1bcc01e010a85d64fcf4fcb17177addf3a16d4f4fdd74221f2e
-MISC metadata.xml 314 RMD160 25181cde297628576a9545bea3a76601485bfaf3 SHA1 ac16b621acf5a22b64859e3323d466fb556fc4c8 SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkt7CUQACgkQgAnW8HDreRa96ACfYo8grmejqMAAb5wKjv/p42wZ
-jYkAni9ijZuUwe9E0ULMg9AYgVapqRof
-=ln5B
------END PGP SIGNATURE-----
+MISC ChangeLog 1925 RMD160 4a915455ebf7f7d998adacba257d0a5cd6205003 SHA1 9c5706b3234b88e15912d12fd7405a276775077e SHA256 921491941cca1817f0c2e09ee18f47b014781b7a4e345228797d4c66a65e41f0
+MISC metadata.xml 251 RMD160 f8345c38d89ae33d7a093995c0db27f49f6eafd3 SHA1 c2e28ac7afc0c0258bb721aa0951de8c3c7c1241 SHA256 0c26270b51e8f74579936e5e8e38f9a64208a4f47ca6d834f94aebfbeb3df06b
diff --git a/net-misc/arpd/arpd-0.2-r1.ebuild b/net-misc/arpd/arpd-0.2-r1.ebuild
index 9f308f3b02ee..a5d076dde55f 100644
--- a/net-misc/arpd/arpd-0.2-r1.ebuild
+++ b/net-misc/arpd/arpd-0.2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/arpd/arpd-0.2-r1.ebuild,v 1.1 2010/02/16 21:08:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/arpd/arpd-0.2-r1.ebuild,v 1.2 2010/09/16 22:47:14 xmw Exp $
 
 EAPI="3"
 
-inherit eutils
+inherit autotools eutils
 
 DESCRIPTION="ARP server which claims all unassigned addresses (for network monitoring or simulation)"
 HOMEPAGE="http://www.citi.umich.edu/u/provos/honeyd/"
@@ -25,11 +25,11 @@ S=${WORKDIR}/${PN}
 src_prepare() {
 	epatch "${FILESDIR}"/arpd.c.patch
 	epatch "${FILESDIR}"/${P}-libevent.patch
+	
+	#fix bug 337481, replace test on libevent.a with libevent.so
+	epatch "${FILESDIR}"/${P}-buildsystem-libevent-test.patch
 
-	sed -i \
-		-e 's|$withval/lib/libevent.a; then||' \
-		-e 's|if test -f $withval/include/event.h -a -f|if test -f $withval/include/event.h -a -f $withval/lib/libevent.a; then|' \
-		configure || die "sed failed"
+	eautoreconf
 }
 
 src_configure() {
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
new file mode 100644
index 000000000000..c0c0f47712a8
--- /dev/null
+++ b/net-misc/arpd/files/arpd-0.2-buildsystem-libevent-test.patch
@@ -0,0 +1,11 @@
+--- configure.in.orig	2003-02-09 19:30:33.000000000 +0100
++++ configure.in	2010-09-17 00:33:36.138294836 +0200
+@@ -62,7 +62,7 @@
+      ;;
+   *)
+      AC_MSG_RESULT($withval)
+-     if test -f $withval/include/event.h -a -f $withval/lib/libevent.a; then
++     if test -f $withval/include/event.h -a -f $withval/lib/libevent.so; then
+         owd=`pwd`
+         if cd $withval; then withval=`pwd`; cd $owd; fi
+         EVENTINC="-I$withval/include"
diff --git a/net-misc/arpd/metadata.xml b/net-misc/arpd/metadata.xml
index b17012b02b48..5355a5e8f3e7 100644
--- a/net-misc/arpd/metadata.xml
+++ b/net-misc/arpd/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>no-herd</herd>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
 	</maintainer>
 </pkgmetadata>