Gentoo Archives: gentoo-commits

From: "Tobias Scherbaum (dertobi123)" <dertobi123@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-analyzer/nagios-core: ChangeLog nagios-core-3.1.2.ebuild
Date: Sat, 27 Jun 2009 21:10:49
Message-Id: E1MKfAc-0000V8-FJ@stork.gentoo.org
1 dertobi123 09/06/27 21:10:46
2
3 Modified: ChangeLog nagios-core-3.1.2.ebuild
4 Log:
5 QA: call econf in src_configure(), #275633
6 (Portage version: 2.2_rc33/cvs/Linux i686)
7
8 Revision Changes Path
9 1.153 net-analyzer/nagios-core/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/nagios-core/ChangeLog?rev=1.153&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/nagios-core/ChangeLog?rev=1.153&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/nagios-core/ChangeLog?r1=1.152&r2=1.153
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v
18 retrieving revision 1.152
19 retrieving revision 1.153
20 diff -u -r1.152 -r1.153
21 --- ChangeLog 27 Jun 2009 13:07:29 -0000 1.152
22 +++ ChangeLog 27 Jun 2009 21:10:46 -0000 1.153
23 @@ -1,6 +1,10 @@
24 # ChangeLog for net-analyzer/nagios-core
25 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.152 2009/06/27 13:07:29 ranger Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.153 2009/06/27 21:10:46 dertobi123 Exp $
28 +
29 + 27 Jun 2009; Tobias Scherbaum <dertobi123@g.o>
30 + nagios-core-3.1.2.ebuild:
31 + QA: call econf in src_configure(), #275633
32
33 27 Jun 2009; Brent Baude <ranger@g.o> nagios-core-2.12-r1.ebuild,
34 nagios-core-3.0.6-r2.ebuild:
35
36
37
38 1.2 net-analyzer/nagios-core/nagios-core-3.1.2.ebuild
39
40 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/nagios-core/nagios-core-3.1.2.ebuild?rev=1.2&view=markup
41 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/nagios-core/nagios-core-3.1.2.ebuild?rev=1.2&content-type=text/plain
42 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/nagios-core/nagios-core-3.1.2.ebuild?r1=1.1&r2=1.2
43
44 Index: nagios-core-3.1.2.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-3.1.2.ebuild,v
47 retrieving revision 1.1
48 retrieving revision 1.2
49 diff -u -r1.1 -r1.2
50 --- nagios-core-3.1.2.ebuild 24 Jun 2009 21:27:21 -0000 1.1
51 +++ nagios-core-3.1.2.ebuild 27 Jun 2009 21:10:46 -0000 1.2
52 @@ -1,6 +1,6 @@
53 # Copyright 1999-2009 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-3.1.2.ebuild,v 1.1 2009/06/24 21:27:21 dertobi123 Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-3.1.2.ebuild,v 1.2 2009/06/27 21:10:46 dertobi123 Exp $
57
58 EAPI="2"
59
60 @@ -36,15 +36,12 @@
61 enewuser nagios -1 /bin/bash /var/nagios/home nagios
62 }
63
64 -src_unpack() {
65 - unpack ${A}
66 - cd "${S}"
67 -
68 +src_prepare() {
69 local strip="$(echo '$(MAKE) strip-post-install')"
70 sed -i -e "s:${strip}::" {cgi,base}/Makefile.in || die "sed failed in Makefile.in"
71 }
72
73 -src_compile() {
74 +src_configure() {
75 local myconf
76
77 if use perl ; then
78 @@ -80,7 +77,9 @@
79 --sysconfdir=/etc/nagios \
80 --libexecdir=/usr/$(get_libdir)/nagios/plugins \
81 || die "./configure failed"
82 +}
83
84 +src_compile() {
85 emake CC=$(tc-getCC) nagios || die "make failed"
86
87 if use web ; then