Bump to EAPI=3, add prefix keywords, add patch to not search everywhere for includes

(Portage version: 2.2_rc67/cvs/Linux i686)

3 files changed, 33 insertions, 11 deletions

diff --git a/net-analyzer/ngrep/ChangeLog b/net-analyzer/ngrep/ChangeLog
index 7ce16a4a9ae3..ab05d6cfc1b2 100644
--- a/net-analyzer/ngrep/ChangeLog
+++ b/net-analyzer/ngrep/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/ngrep
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ngrep/ChangeLog,v 1.61 2009/06/01 09:45:49 pva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ngrep/ChangeLog,v 1.62 2010/05/26 16:31:12 abcd Exp $
+
+  26 May 2010; Jonathan Callen <abcd@gentoo.org> ngrep-1.45-r2.ebuild,
+  +files/ngrep-1.45-prefix.patch:
+  Bump to EAPI=3, add prefix keywords, add patch to not search everywhere
+  for includes
 
   01 Jun 2009; Peter Volkov <pva@gentoo.org> -ngrep-1.45.ebuild,
   -ngrep-1.45-r1.ebuild:
diff --git a/net-analyzer/ngrep/files/ngrep-1.45-prefix.patch b/net-analyzer/ngrep/files/ngrep-1.45-prefix.patch
new file mode 100644
index 000000000000..afd2a2362395
--- /dev/null
+++ b/net-analyzer/ngrep/files/ngrep-1.45-prefix.patch
@@ -0,0 +1,17 @@
+* refrain from doing an absolutely insane check (to see if pcap is
+  installed in more than one place)
+
+--- configure.in.orig	2008-01-16 21:30:55 +0100
++++ configure.in	2008-01-16 21:32:42 +0100
+@@ -268,10 +268,7 @@
+ 
+ AC_MSG_CHECKING(for a complete set of pcap headers)
+ 
+-possible_dirs="`eval echo -n ${includedir}` \
+-	       /usr/include /usr/include/pcap \
+-               /usr/local/include /usr/local/include/pcap \
+-               /usr/share/include /usr/share/include/pcap"
++possible_dirs="`eval echo -n ${includedir}`"
+ 
+ AC_ARG_WITH(pcap-includes,
+ [  --with-pcap-includes        specify the pcap include directory],
diff --git a/net-analyzer/ngrep/ngrep-1.45-r2.ebuild b/net-analyzer/ngrep/ngrep-1.45-r2.ebuild
index cc599b5f16a3..ad1d814193c1 100644
--- a/net-analyzer/ngrep/ngrep-1.45-r2.ebuild
+++ b/net-analyzer/ngrep/ngrep-1.45-r2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ngrep/ngrep-1.45-r2.ebuild,v 1.7 2009/05/31 15:35:57 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ngrep/ngrep-1.45-r2.ebuild,v 1.8 2010/05/26 16:31:12 abcd Exp $
+
+EAPI="3"
 
 inherit eutils autotools
 
@@ -10,28 +12,26 @@ SRC_URI="mirror://sourceforge/ngrep/${P}.tar.bz2"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6 pcre"
 
 DEPEND="net-libs/libpcap
 	pcre? ( dev-libs/libpcre )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	# Remove bundled libpcre to avoid occasional linking with them
 	rm -rf pcre-5.0
 	epatch "${FILESDIR}/${P}-build-fixes.patch"
 	epatch "${FILESDIR}/${P}-setlocale.patch"
+	epatch "${FILESDIR}/${P}-prefix.patch"
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	econf --with-dropprivs-user=ngrep \
-		--with-pcap-includes=/usr/include \
+		--with-pcap-includes="${EPREFIX}"/usr/include \
 		$(use_enable pcre) \
 		$(use_enable ipv6)
-	emake || die "emake failed"
 }
 
 pkg_preinst() {