Closing #37443.

4 files changed, 50 insertions, 6 deletions

diff --git a/net-analyzer/etherape/ChangeLog b/net-analyzer/etherape/ChangeLog
index 3581e654a3b8..14e2d3dd4bb1 100644
--- a/net-analyzer/etherape/ChangeLog
+++ b/net-analyzer/etherape/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/etherape
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/etherape/ChangeLog,v 1.8 2004/01/06 03:13:41 weeve Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/etherape/ChangeLog,v 1.9 2004/02/06 12:55:56 aliz Exp $
+
+  06 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> etherape-0.9.0.ebuild:
+  Fix libpcap include and other things, amd64 keyword. Closing #37443.
 
   05 Jan 2004; Jason Wever <weeve@gentoo.org> etherape-0.9.0.ebuild:
   Marked stable on sparc.
diff --git a/net-analyzer/etherape/etherape-0.9.0.ebuild b/net-analyzer/etherape/etherape-0.9.0.ebuild
index d38337a94556..6cf45f298490 100644
--- a/net-analyzer/etherape/etherape-0.9.0.ebuild
+++ b/net-analyzer/etherape/etherape-0.9.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/etherape/etherape-0.9.0.ebuild,v 1.3 2004/01/06 03:13:41 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/etherape/etherape-0.9.0.ebuild,v 1.4 2004/02/06 12:55:56 aliz Exp $
 
 IUSE=""
 DESCRIPTION="A graphical network monitor for Unix modeled after etherman"
@@ -9,12 +9,28 @@ HOMEPAGE="http://etherape.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc sparc"
+KEYWORDS="x86 ~ppc sparc ~amd64"
 
 DEPEND=">=gnome-base/libglade-2.0
 	>=gnome-base/libgnomeui-2.0
 	>=net-libs/libpcap-0.6.1
-	sys-devel/gettext"
+	sys-devel/gettext
+	sys-devel/autoconf"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	epatch ${FILESDIR}/${P}-libpcap-include.patch
+	epatch ${FILESDIR}/${P}-res_mkquery.patch
+}
+
+src_compile() {
+	aclocal
+	autoconf
+
+	econf || die
+	emake || die
+}
 
 src_install() {
 	einstall
diff --git a/net-analyzer/etherape/files/etherape-0.9.0-libpcap-include.patch b/net-analyzer/etherape/files/etherape-0.9.0-libpcap-include.patch
new file mode 100644
index 000000000000..fded788d66cf
--- /dev/null
+++ b/net-analyzer/etherape/files/etherape-0.9.0-libpcap-include.patch
@@ -0,0 +1,13 @@
+--- acinclude.m4	2001-04-19 16:56:23.000000000 +0000
++++ acinclude.m4	2004-02-06 12:04:04.119738872 +0000
+@@ -131,8 +131,8 @@
+ 	fi
+ 
+ 	# Pcap header checks
+-	AC_CHECK_HEADER(net/bpf.h,,
+-	    AC_MSG_ERROR([[Header file net/bpf.h not found; if you installed libpcap from source, did you also do \"make install-incl\"?]]))
++	AC_CHECK_HEADER(pcap-bpf.h,,
++	    AC_MSG_ERROR([[Header file pcap-bpf.h not found; if you installed libpcap from source, did you also do \"make install-incl\"?]]))
+ 	AC_CHECK_HEADER(pcap.h,, AC_MSG_ERROR(Header file pcap.h not found.))
+ 
+ 	#
diff --git a/net-analyzer/etherape/files/etherape-0.9.0-res_mkquery.patch b/net-analyzer/etherape/files/etherape-0.9.0-res_mkquery.patch
new file mode 100644
index 000000000000..51a8fd66cd3f
--- /dev/null
+++ b/net-analyzer/etherape/files/etherape-0.9.0-res_mkquery.patch
@@ -0,0 +1,12 @@
+--- configure.in	2003-03-01 22:05:30.000000000 +0000
++++ configure.in	2004-02-06 12:00:20.538728352 +0000
+@@ -52,7 +52,8 @@
+ 
+ AC_CHECK_FUNC(res_mkquery, , 
+   AC_CHECK_LIB(bind, res_mkquery, , 
+-   AC_CHECK_LIB(resolv, res_mkquery, , AC_MSG_ERROR(No resolver library found))))
++   AC_CHECK_LIB(resolv, res_mkquery, ,
++    AC_CHECK_LIB(resolv, __res_mkquery, , AC_MSG_ERROR(No resolver library found)))))
+ 
+ # Check for the pcap library.
+ AC_ARG_ENABLE(static-pcap,