Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-analyzer/bmon: ChangeLog bmon-2.1.1_pre1.ebuild
Date: Fri, 01 Feb 2013 15:34:55
Message-Id: 20130201153452.3E0852171E@flycatcher.gentoo.org
1 jer 13/02/01 15:34:52
2
3 Modified: ChangeLog bmon-2.1.1_pre1.ebuild
4 Log:
5 Verbose build.
6
7 (Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key A792A613)
8
9 Revision Changes Path
10 1.47 net-analyzer/bmon/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/bmon/ChangeLog?rev=1.47&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/bmon/ChangeLog?rev=1.47&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/bmon/ChangeLog?r1=1.46&r2=1.47
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-analyzer/bmon/ChangeLog,v
19 retrieving revision 1.46
20 retrieving revision 1.47
21 diff -u -r1.46 -r1.47
22 --- ChangeLog 6 Mar 2012 19:07:32 -0000 1.46
23 +++ ChangeLog 1 Feb 2013 15:34:52 -0000 1.47
24 @@ -1,6 +1,10 @@
25 # ChangeLog for net-analyzer/bmon
26 -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/ChangeLog,v 1.46 2012/03/06 19:07:32 jer Exp $
28 +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
29 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/ChangeLog,v 1.47 2013/02/01 15:34:52 jer Exp $
30 +
31 + 01 Feb 2013; Jeroen Roovers <jer@g.o> bmon-2.1.1_pre1.ebuild,
32 + +files/bmon-2.1.1-verbose.patch:
33 + Verbose build.
34
35 06 Mar 2012; Jeroen Roovers <jer@g.o> bmon-2.1.0-r3.ebuild,
36 bmon-2.1.1_pre1.ebuild:
37
38
39
40 1.6 net-analyzer/bmon/bmon-2.1.1_pre1.ebuild
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/bmon/bmon-2.1.1_pre1.ebuild?rev=1.6&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/bmon/bmon-2.1.1_pre1.ebuild?rev=1.6&content-type=text/plain
44 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/bmon/bmon-2.1.1_pre1.ebuild?r1=1.5&r2=1.6
45
46 Index: bmon-2.1.1_pre1.ebuild
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/net-analyzer/bmon/bmon-2.1.1_pre1.ebuild,v
49 retrieving revision 1.5
50 retrieving revision 1.6
51 diff -u -r1.5 -r1.6
52 --- bmon-2.1.1_pre1.ebuild 6 Mar 2012 19:07:32 -0000 1.5
53 +++ bmon-2.1.1_pre1.ebuild 1 Feb 2013 15:34:52 -0000 1.6
54 @@ -1,9 +1,8 @@
55 -# Copyright 1999-2012 Gentoo Foundation
56 +# Copyright 1999-2013 Gentoo Foundation
57 # Distributed under the terms of the GNU General Public License v2
58 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/bmon-2.1.1_pre1.ebuild,v 1.5 2012/03/06 19:07:32 jer Exp $
59 -
60 -EAPI="1"
61 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/bmon-2.1.1_pre1.ebuild,v 1.6 2013/02/01 15:34:52 jer Exp $
62
63 +EAPI=5
64 inherit eutils toolchain-funcs
65
66 MY_PV="${PV/_pre/-pre}"
67 @@ -18,15 +17,17 @@
68 KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
69 IUSE="dbi rrdtool"
70
71 -DEPEND=">=sys-libs/ncurses-5.3-r2
72 +DEPEND="
73 + >=sys-libs/ncurses-5.3-r2
74 dev-libs/libnl:1.1
75 dbi? ( >=dev-db/libdbi-0.7.2-r1 )
76 - rrdtool? ( >=net-analyzer/rrdtool-1.2.6-r1 )"
77 + rrdtool? ( >=net-analyzer/rrdtool-1.2.6-r1 )
78 +"
79 RDEPEND="${DEPEND}"
80
81 -src_unpack() {
82 - unpack ${A}
83 - cd "${S}"
84 +DOCS=( ChangeLog )
85 +
86 +src_prepare() {
87 # gcc4 fix, bug 105343
88 epatch "${FILESDIR}"/${PN}-2.1.0-gcc4.diff
89 # Don't strip, bug #144370
90 @@ -35,16 +36,15 @@
91 epatch "${FILESDIR}"/${PN}-2.1.0-libnl-1.0.patch
92 # newer sysfs has symlinks for net class
93 epatch "${FILESDIR}"/${PN}-2.1.0-sysfs-symlink.patch
94 + # verbose build
95 + epatch "${FILESDIR}"/${PN}-2.1.1-verbose.patch
96 }
97
98 -src_compile() {
99 +src_configure() {
100 econf \
101 $(use_enable dbi) \
102 - $(use_enable rrdtool rrd) || die "econf failed"
103 - emake CPPFLAGS="${CXXFLAGS} -I${WORKDIR}/libnl-${NLVER}/include" || die "emake failed"
104 + $(use_enable rrdtool rrd)
105 }
106 -
107 -src_install() {
108 - emake DESTDIR="${D}" install || die "emake install failed"
109 - dodoc ChangeLog
110 +src_compile() {
111 + emake CPPFLAGS="${CXXFLAGS} -I${WORKDIR}/libnl-${NLVER}/include"
112 }