Gentoo Archives: gentoo-commits

From: "Vlastimil Babka (caster)" <caster@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-benchmarks/bootchart: bootchart-0.9-r4.ebuild bootchart-0.9-r2.ebuild ChangeLog metadata.xml bootchart-0.9-r3.ebuild
Date: Tue, 27 Apr 2010 13:11:00
Message-Id: 20100427131056.222462C04C@corvid.gentoo.org
1 caster 10/04/27 13:10:55
2
3 Modified: bootchart-0.9-r2.ebuild ChangeLog metadata.xml
4 bootchart-0.9-r3.ebuild
5 Added: bootchart-0.9-r4.ebuild
6 Log:
7 Revbump to fix USE=acct, bug #317451 thanks to Christian Ruppert <idl0r@g.o>. Update postinst message for genkernel case, bug #275251. Move to EAPI=2 and improve usage of java eclasses. Add maintainer-needed to metadata, as java is only optional here and a dedicated maintainer would be better.
8 (Portage version: 2.2_rc67/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.6 app-benchmarks/bootchart/bootchart-0.9-r2.ebuild
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-benchmarks/bootchart/bootchart-0.9-r2.ebuild?rev=1.6&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-benchmarks/bootchart/bootchart-0.9-r2.ebuild?rev=1.6&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-benchmarks/bootchart/bootchart-0.9-r2.ebuild?r1=1.5&r2=1.6
16
17 Index: bootchart-0.9-r2.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart/bootchart-0.9-r2.ebuild,v
20 retrieving revision 1.5
21 retrieving revision 1.6
22 diff -u -r1.5 -r1.6
23 --- bootchart-0.9-r2.ebuild 12 Oct 2009 19:00:52 -0000 1.5
24 +++ bootchart-0.9-r2.ebuild 27 Apr 2010 13:10:55 -0000 1.6
25 @@ -1,6 +1,6 @@
26 -# Copyright 1999-2009 Gentoo Foundation
27 +# Copyright 1999-2010 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart/bootchart-0.9-r2.ebuild,v 1.5 2009/10/12 19:00:52 halcy0n Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart/bootchart-0.9-r2.ebuild,v 1.6 2010/04/27 13:10:55 caster Exp $
31
32 inherit multilib eutils java-pkg-opt-2 java-ant-2
33
34 @@ -100,7 +100,9 @@
35 else
36 elog "To generate the chart, append this to your kernel commandline"
37 elog " init=/sbin/bootchartd"
38 - elog "and reboot"
39 + elog "and reboot."
40 + elog "Note: genkernel users should replace init= with real_init= in the above"
41 + elog "see https://bugs.gentoo.org/show_bug.cgi?id=275251 for more info"
42 fi
43 elog
44
45
46
47
48 1.14 app-benchmarks/bootchart/ChangeLog
49
50 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-benchmarks/bootchart/ChangeLog?rev=1.14&view=markup
51 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-benchmarks/bootchart/ChangeLog?rev=1.14&content-type=text/plain
52 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-benchmarks/bootchart/ChangeLog?r1=1.13&r2=1.14
53
54 Index: ChangeLog
55 ===================================================================
56 RCS file: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart/ChangeLog,v
57 retrieving revision 1.13
58 retrieving revision 1.14
59 diff -u -r1.13 -r1.14
60 --- ChangeLog 12 Oct 2009 19:00:52 -0000 1.13
61 +++ ChangeLog 27 Apr 2010 13:10:55 -0000 1.14
62 @@ -1,6 +1,17 @@
63 # ChangeLog for app-benchmarks/bootchart
64 -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
65 -# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart/ChangeLog,v 1.13 2009/10/12 19:00:52 halcy0n Exp $
66 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
67 +# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart/ChangeLog,v 1.14 2010/04/27 13:10:55 caster Exp $
68 +
69 +*bootchart-0.9-r4 (27 Apr 2010)
70 +
71 + 27 Apr 2010; Vlastimil Babka <caster@g.o> bootchart-0.9-r2.ebuild,
72 + bootchart-0.9-r3.ebuild, +bootchart-0.9-r4.ebuild, +files/accton.patch,
73 + metadata.xml:
74 + Revbump to fix USE=acct, bug #317451 thanks to Christian Ruppert
75 + <idl0r@g.o>. Update postinst message for genkernel case, bug
76 + #275251. Move to EAPI=2 and improve usage of java eclasses. Add
77 + maintainer-needed to metadata, as java is only optional here and a
78 + dedicated maintainer would be better.
79
80 12 Oct 2009; Mark Loeser <halcy0n@g.o> bootchart-0.9-r2.ebuild:
81 QA fixes; remove useless dodoc COPYING
82
83
84
85 1.6 app-benchmarks/bootchart/metadata.xml
86
87 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-benchmarks/bootchart/metadata.xml?rev=1.6&view=markup
88 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-benchmarks/bootchart/metadata.xml?rev=1.6&content-type=text/plain
89 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-benchmarks/bootchart/metadata.xml?r1=1.5&r2=1.6
90
91 Index: metadata.xml
92 ===================================================================
93 RCS file: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart/metadata.xml,v
94 retrieving revision 1.5
95 retrieving revision 1.6
96 diff -u -r1.5 -r1.6
97 --- metadata.xml 23 Jul 2008 21:44:45 -0000 1.5
98 +++ metadata.xml 27 Apr 2010 13:10:55 -0000 1.6
99 @@ -2,6 +2,11 @@
100 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
101 <pkgmetadata>
102 <herd>java</herd>
103 + <maintainer>
104 + <email>maintainer-needed@g.o</email>
105 + <name>Default assignee for orphaned packages</name>
106 + <description>Java is just optional in this package. A dedicated maintainer would be preferable.</description>
107 + </maintainer>
108 <longdescription lang="en">
109 Performance analysis and visualization of the system boot process.
110 </longdescription>
111
112
113
114 1.2 app-benchmarks/bootchart/bootchart-0.9-r3.ebuild
115
116 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-benchmarks/bootchart/bootchart-0.9-r3.ebuild?rev=1.2&view=markup
117 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-benchmarks/bootchart/bootchart-0.9-r3.ebuild?rev=1.2&content-type=text/plain
118 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-benchmarks/bootchart/bootchart-0.9-r3.ebuild?r1=1.1&r2=1.2
119
120 Index: bootchart-0.9-r3.ebuild
121 ===================================================================
122 RCS file: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart/bootchart-0.9-r3.ebuild,v
123 retrieving revision 1.1
124 retrieving revision 1.2
125 diff -u -r1.1 -r1.2
126 --- bootchart-0.9-r3.ebuild 10 Mar 2009 11:55:40 -0000 1.1
127 +++ bootchart-0.9-r3.ebuild 27 Apr 2010 13:10:55 -0000 1.2
128 @@ -1,6 +1,6 @@
129 -# Copyright 1999-2009 Gentoo Foundation
130 +# Copyright 1999-2010 Gentoo Foundation
131 # Distributed under the terms of the GNU General Public License v2
132 -# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart/bootchart-0.9-r3.ebuild,v 1.1 2009/03/10 11:55:40 zzam Exp $
133 +# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart/bootchart-0.9-r3.ebuild,v 1.2 2010/04/27 13:10:55 caster Exp $
134
135 inherit multilib eutils java-pkg-opt-2 java-ant-2
136
137 @@ -102,6 +102,8 @@
138 elog "To generate the chart, append this to your kernel commandline"
139 elog " init=/sbin/bootchartd"
140 elog "and reboot"
141 + elog "Note: genkernel users should replace init= with real_init= in the above"
142 + elog "see https://bugs.gentoo.org/show_bug.cgi?id=275251 for more info"
143 fi
144 elog
145
146
147
148
149 1.1 app-benchmarks/bootchart/bootchart-0.9-r4.ebuild
150
151 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-benchmarks/bootchart/bootchart-0.9-r4.ebuild?rev=1.1&view=markup
152 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-benchmarks/bootchart/bootchart-0.9-r4.ebuild?rev=1.1&content-type=text/plain
153
154 Index: bootchart-0.9-r4.ebuild
155 ===================================================================
156 # Copyright 1999-2010 Gentoo Foundation
157 # Distributed under the terms of the GNU General Public License v2
158 # $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart/bootchart-0.9-r4.ebuild,v 1.1 2010/04/27 13:10:55 caster Exp $
159
160 EAPI="2"
161 JAVA_PKG_IUSE="source"
162
163 inherit multilib eutils java-pkg-opt-2 java-ant-2
164
165 DESCRIPTION="Performance analysis and visualization of the system boot process"
166 HOMEPAGE="http://www.bootchart.org/"
167 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
168
169 LICENSE="GPL-2"
170 SLOT="0"
171 KEYWORDS="~amd64 ~hppa ~x86"
172 IUSE="acct debug doc java"
173
174 DEPEND="
175 java? (
176 >=virtual/jdk-1.4
177 dev-java/commons-cli
178 )
179 "
180 RDEPEND="
181 java? (
182 >=virtual/jre-1.4
183 dev-java/commons-cli
184 )
185 acct? ( sys-process/acct )
186 "
187
188 src_prepare() {
189 epatch "${FILESDIR}/${P}"-gentoo.patch
190 epatch "${FILESDIR}/${P}"-sh.patch
191 epatch "${FILESDIR}/${P}"-dev-null.patch
192 # bug #317451
193 epatch "${FILESDIR}/accton.patch"
194
195 # delete the included commons-cli and use gentoo's instead
196 # The rest of lib is also bundled but a bit problematic to
197 # package https://bugs.gentoo.org/show_bug.cgi?id=162788
198 rm -rf lib/org/apache/commons/cli lib/org/apache/commons/lang
199
200 if use java ; then
201 java-ant_rewrite-classpath
202 sed -i -e 's,AUTO_RENDER="no",AUTO_RENDER="yes",g' \
203 script/bootchartd.conf || die
204 fi
205
206 if use acct ; then
207 sed -i -e 's,PROCESS_ACCOUNTING="no",PROCESS_ACCOUNTING="yes",g' \
208 script/bootchartd.conf || die
209 fi
210
211 java-pkg-opt-2_src_prepare
212 }
213
214 src_compile() {
215 if use java ; then
216 local antflags="jar -Dcompiler.nowarn=true $(use_doc)"
217 use debug || antflags="${antflags} -Dbuild.debug=false"
218 eant ${antflags} \
219 -Dgentoo.classpath="$(java-pkg_getjars commons-cli-1):./build"
220 fi
221 }
222
223 src_install() {
224 dodoc README README.logger ChangeLog TODO || die
225
226 # No need for this with baselayout-2
227 if has_version "<sys-apps/baselayout-2"; then
228 insinto /$(get_libdir)/rcscripts/addons
229 doins "${FILESDIR}"/profiling-functions.sh || die
230 fi
231
232 into /
233 newsbin script/bootchartd bootchartd || die
234 into /usr
235
236 # This dir is normally empty, but is used to bind to the
237 # temporary dir bootchart normally makes. We do this so
238 # that our profiling script can write to a fixed location.
239 keepdir /lib/bootchart
240
241 insinto /etc
242 doins script/bootchartd.conf || die
243
244 if use java ; then
245 java-pkg_dojar "${PN}.jar"
246 use doc && java-pkg_dojavadoc javadoc/api
247 use source && java-pkg_dosrc src/org
248 java-pkg_dolauncher ${PN} \
249 --main org.bootchart.Main \
250 --java_args "-Djava.awt.headless=true"
251 fi
252 }
253
254 pkg_postinst() {
255 if has_version "<sys-apps/baselayout-2"; then
256 elog "To generate the chart, set RC_USE_BOOTCHART=\"yes\""
257 elog "in /etc/conf.d/rc and reboot"
258 else
259 elog "To generate the chart, append this to your kernel commandline"
260 elog " init=/sbin/bootchartd"
261 elog "and reboot"
262 elog "Note: genkernel users should replace init= with real_init= in the above"
263 elog "see https://bugs.gentoo.org/show_bug.cgi?id=275251 for more info"
264 fi
265 elog
266
267 if use java; then
268 elog "The chart will be saved as /var/log/bootchart.png"
269 else
270 elog "Post the file /var/log/bootchart.tgz here:"
271 elog " http://www.bootchart.org/download.html"
272 elog "to render the chart"
273 fi
274
275 elog
276 elog "For best results: "
277 elog " Enable BSD process accounting v3 in the kernel"
278 elog " This will produce more accurate process trees"
279 elog " Set AUTO_RENDER_FORMAT to svg in /etc/bootchartd.conf"
280 elog " and view /var/log/bootchart.svgz with batik or"
281 elog " Adobe SVG viewer. This will give you additional"
282 elog " information about the processes in tooltips"
283 }