Gentoo Archives: gentoo-commits

From: "Jonathan Callen (abcd)" <abcd@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-analyzer/ngrep: ChangeLog ngrep-1.45-r2.ebuild
Date: Wed, 26 May 2010 16:31:19
Message-Id: 20100526163113.3CDE32CEDE@corvid.gentoo.org
1 abcd 10/05/26 16:31:13
2
3 Modified: ChangeLog ngrep-1.45-r2.ebuild
4 Log:
5 Bump to EAPI=3, add prefix keywords, add patch to not search everywhere for includes
6 (Portage version: 2.2_rc67/cvs/Linux i686)
7
8 Revision Changes Path
9 1.62 net-analyzer/ngrep/ChangeLog
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ngrep/ChangeLog?rev=1.62&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ngrep/ChangeLog?rev=1.62&content-type=text/plain
13 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ngrep/ChangeLog?r1=1.61&r2=1.62
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/net-analyzer/ngrep/ChangeLog,v
18 retrieving revision 1.61
19 retrieving revision 1.62
20 diff -u -r1.61 -r1.62
21 --- ChangeLog 1 Jun 2009 09:45:49 -0000 1.61
22 +++ ChangeLog 26 May 2010 16:31:12 -0000 1.62
23 @@ -1,6 +1,11 @@
24 # ChangeLog for net-analyzer/ngrep
25 -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ngrep/ChangeLog,v 1.61 2009/06/01 09:45:49 pva Exp $
27 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
28 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ngrep/ChangeLog,v 1.62 2010/05/26 16:31:12 abcd Exp $
29 +
30 + 26 May 2010; Jonathan Callen <abcd@g.o> ngrep-1.45-r2.ebuild,
31 + +files/ngrep-1.45-prefix.patch:
32 + Bump to EAPI=3, add prefix keywords, add patch to not search everywhere
33 + for includes
34
35 01 Jun 2009; Peter Volkov <pva@g.o> -ngrep-1.45.ebuild,
36 -ngrep-1.45-r1.ebuild:
37
38
39
40 1.8 net-analyzer/ngrep/ngrep-1.45-r2.ebuild
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ngrep/ngrep-1.45-r2.ebuild?rev=1.8&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ngrep/ngrep-1.45-r2.ebuild?rev=1.8&content-type=text/plain
44 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ngrep/ngrep-1.45-r2.ebuild?r1=1.7&r2=1.8
45
46 Index: ngrep-1.45-r2.ebuild
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/net-analyzer/ngrep/ngrep-1.45-r2.ebuild,v
49 retrieving revision 1.7
50 retrieving revision 1.8
51 diff -u -r1.7 -r1.8
52 --- ngrep-1.45-r2.ebuild 31 May 2009 15:35:57 -0000 1.7
53 +++ ngrep-1.45-r2.ebuild 26 May 2010 16:31:12 -0000 1.8
54 @@ -1,6 +1,8 @@
55 -# Copyright 1999-2009 Gentoo Foundation
56 +# Copyright 1999-2010 Gentoo Foundation
57 # Distributed under the terms of the GNU General Public License v2
58 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ngrep/ngrep-1.45-r2.ebuild,v 1.7 2009/05/31 15:35:57 ranger Exp $
59 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ngrep/ngrep-1.45-r2.ebuild,v 1.8 2010/05/26 16:31:12 abcd Exp $
60 +
61 +EAPI="3"
62
63 inherit eutils autotools
64
65 @@ -10,28 +12,26 @@
66
67 LICENSE="as-is"
68 SLOT="0"
69 -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
70 +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
71 IUSE="ipv6 pcre"
72
73 DEPEND="net-libs/libpcap
74 pcre? ( dev-libs/libpcre )"
75
76 -src_unpack() {
77 - unpack ${A}
78 - cd "${S}"
79 +src_prepare() {
80 # Remove bundled libpcre to avoid occasional linking with them
81 rm -rf pcre-5.0
82 epatch "${FILESDIR}/${P}-build-fixes.patch"
83 epatch "${FILESDIR}/${P}-setlocale.patch"
84 + epatch "${FILESDIR}/${P}-prefix.patch"
85 eautoreconf
86 }
87
88 -src_compile() {
89 +src_configure() {
90 econf --with-dropprivs-user=ngrep \
91 - --with-pcap-includes=/usr/include \
92 + --with-pcap-includes="${EPREFIX}"/usr/include \
93 $(use_enable pcre) \
94 $(use_enable ipv6)
95 - emake || die "emake failed"
96 }
97
98 pkg_preinst() {