Gentoo Archives: gentoo-commits

From: "Ulrich Mueller (ulm)" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-doc/doxygen: doxygen-1.5.5.ebuild doxygen-1.5.4.ebuild doxygen-1.5.7.1.ebuild doxygen-1.5.8.ebuild ChangeLog doxygen-1.4.7.ebuild doxygen-1.5.6.ebuild
Date: Sat, 30 May 2009 08:19:56
Message-Id: E1MAJnF-0003sr-Ad@stork.gentoo.org
1 ulm 09/05/30 08:19:53
2
3 Modified: doxygen-1.5.5.ebuild doxygen-1.5.4.ebuild
4 doxygen-1.5.7.1.ebuild doxygen-1.5.8.ebuild
5 ChangeLog doxygen-1.4.7.ebuild doxygen-1.5.6.ebuild
6 Log:
7 Remove app-text/tetex from dependencies, bug 227443.
8 (Portage version: 2.2_rc33/cvs/Linux i686)
9
10 Revision Changes Path
11 1.7 app-doc/doxygen/doxygen-1.5.5.ebuild
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/doxygen-1.5.5.ebuild?rev=1.7&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/doxygen-1.5.5.ebuild?rev=1.7&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/doxygen-1.5.5.ebuild?r1=1.6&r2=1.7
16
17 Index: doxygen-1.5.5.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.5.ebuild,v
20 retrieving revision 1.6
21 retrieving revision 1.7
22 diff -u -r1.6 -r1.7
23 --- doxygen-1.5.5.ebuild 12 Oct 2008 01:49:49 -0000 1.6
24 +++ doxygen-1.5.5.ebuild 30 May 2009 08:19:53 -0000 1.7
25 @@ -1,6 +1,6 @@
26 -# Copyright 1999-2008 Gentoo Foundation
27 +# Copyright 1999-2009 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.5.ebuild,v 1.6 2008/10/12 01:49:49 nerdboy Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.5.ebuild,v 1.7 2009/05/30 08:19:53 ulm Exp $
31
32 EAPI=1
33
34 @@ -16,13 +16,10 @@
35 IUSE="debug doc nodot qt3 latex elibc_FreeBSD"
36
37 RDEPEND="qt3? ( x11-libs/qt:3 )
38 - latex? ( || (
39 - ( app-text/texlive-core
40 + latex? ( app-text/texlive-core
41 dev-texlive/texlive-latexrecommended
42 dev-texlive/texlive-genericrecommended
43 dev-texlive/texlive-fontsrecommended )
44 - ( app-text/tetex ) )
45 - )
46 dev-lang/python
47 virtual/libiconv
48 media-libs/libpng
49 @@ -40,16 +37,16 @@
50
51 # use CFLAGS, CXXFLAGS, LDFLAGS
52 sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \
53 - -e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \
54 - -e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \
55 - tmake/lib/{{linux,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++}/tmake.conf \
56 - || die "sed failed"
57 + -e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \
58 + -e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \
59 + tmake/lib/{{linux,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++}/tmake.conf \
60 + || die "sed failed"
61
62 # Ensure we link to -liconv
63 if use elibc_FreeBSD; then
64 - for pro in */*.pro.in */*/*.pro.in; do
65 + for pro in */*.pro.in */*/*.pro.in; do
66 echo "unix:LIBS += -liconv" >> "${pro}"
67 - done
68 + done
69 fi
70
71 # Consolidate patches, apply FreeBSD configure patch, codepage patch,
72 @@ -60,18 +57,18 @@
73 epatch "${FILESDIR}/${PN}-1.5-system-libpng.patch"
74
75 if [ $(get_libdir) == "lib64" ] ; then
76 - epatch "${FILESDIR}/${PN}-1.5-qtlibdir.patch"
77 + epatch "${FILESDIR}/${PN}-1.5-qtlibdir.patch"
78 fi
79
80 if is-flagq "-O3" ; then
81 - echo
82 - ewarn "Compiling with -O3 is known to produce incorrectly"
83 - ewarn "optimized code which breaks doxygen."
84 - echo
85 - epause 6
86 - elog "Continuing with -O2 instead ..."
87 - echo
88 - replace-flags "-O3" "-O2"
89 + echo
90 + ewarn "Compiling with -O3 is known to produce incorrectly"
91 + ewarn "optimized code which breaks doxygen."
92 + echo
93 + epause 6
94 + elog "Continuing with -O2 instead ..."
95 + echo
96 + replace-flags "-O3" "-O2"
97 fi
98 }
99
100 @@ -81,52 +78,52 @@
101
102 local my_conf=""
103 if use debug; then
104 - my_conf="--prefix ${D}usr --debug"
105 + my_conf="--prefix ${D}usr --debug"
106 else
107 - my_conf="--prefix ${D}usr"
108 + my_conf="--prefix ${D}usr"
109 fi
110
111 if use qt3; then
112 - einfo "using QTDIR: '$QTDIR'."
113 - export LIBRARY_PATH="${QTDIR}/$(get_libdir):${LIBRARY_PATH}"
114 - export LD_LIBRARY_PATH="${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}"
115 - einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
116 - einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
117 - ./configure ${my_conf} $(use_with qt3 doxywizard) \
118 + einfo "using QTDIR: '$QTDIR'."
119 + export LIBRARY_PATH="${QTDIR}/$(get_libdir):${LIBRARY_PATH}"
120 + export LD_LIBRARY_PATH="${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}"
121 + einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
122 + einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
123 + ./configure ${my_conf} $(use_with qt3 doxywizard) \
124 || die 'configure with qt3 failed'
125 else
126 - ./configure ${my_conf} || die 'configure failed'
127 + ./configure ${my_conf} || die 'configure failed'
128 fi
129
130 # and compile
131 emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)" \
132 - LINK_SHLIB="$(tc-getCXX)" all || die 'emake failed'
133 + LINK_SHLIB="$(tc-getCXX)" all || die 'emake failed'
134
135 # generate html and pdf (if tetex in use) documents.
136 # errors here are not considered fatal, hence the ewarn message
137 # TeX's font caching in /var/cache/fonts causes sandbox warnings,
138 # so we allow it.
139 if use doc; then
140 - if use nodot; then
141 + if use nodot; then
142 sed -i -e "s/HAVE_DOT = YES/HAVE_DOT = NO/" \
143 - {Doxyfile,doc/Doxyfile} || ewarn "disabling dot failed"
144 - fi
145 - if use latex; then
146 + {Doxyfile,doc/Doxyfile} || ewarn "disabling dot failed"
147 + fi
148 + if use latex; then
149 addwrite /var/cache/fonts
150 addwrite /var/cache/fontconfig
151 addwrite /usr/share/texmf/fonts/pk
152 addwrite /usr/share/texmf/ls-R
153 make pdf || ewarn '"make pdf docs" failed.'
154 - else
155 + else
156 cp doc/Doxyfile doc/Doxyfile.orig
157 cp doc/Makefile doc/Makefile.orig
158 sed -i.orig -e "s/GENERATE_LATEX = YES/GENERATE_LATEX = NO/" \
159 - doc/Doxyfile
160 + doc/Doxyfile
161 sed -i.orig -e "s/@epstopdf/# @epstopdf/" \
162 - -e "s/@cp Makefile.latex/# @cp Makefile.latex/" \
163 - -e "s/@sed/# @sed/" doc/Makefile
164 + -e "s/@cp Makefile.latex/# @cp Makefile.latex/" \
165 + -e "s/@sed/# @sed/" doc/Makefile
166 make docs || ewarn '"make html docs" failed.'
167 - fi
168 + fi
169 fi
170 }
171
172 @@ -135,8 +132,8 @@
173 install || die '"make install" failed.'
174
175 if use qt3; then
176 - doicon "${FILESDIR}/doxywizard.png"
177 - make_desktop_entry doxywizard "DoxyWizard ${PV}" \
178 + doicon "${FILESDIR}/doxywizard.png"
179 + make_desktop_entry doxywizard "DoxyWizard ${PV}" \
180 "doxywizard.png" "Application;Development"
181 fi
182
183 @@ -144,11 +141,11 @@
184
185 # pdf and html manuals
186 if use doc; then
187 - insinto /usr/share/doc/"${PF}"
188 - if use latex; then
189 + insinto /usr/share/doc/"${PF}"
190 + if use latex; then
191 doins latex/doxygen_manual.pdf
192 - fi
193 - dohtml -r html/*
194 + fi
195 + dohtml -r html/*
196 fi
197 }
198
199
200
201
202 1.17 app-doc/doxygen/doxygen-1.5.4.ebuild
203
204 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/doxygen-1.5.4.ebuild?rev=1.17&view=markup
205 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/doxygen-1.5.4.ebuild?rev=1.17&content-type=text/plain
206 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/doxygen-1.5.4.ebuild?r1=1.16&r2=1.17
207
208 Index: doxygen-1.5.4.ebuild
209 ===================================================================
210 RCS file: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.4.ebuild,v
211 retrieving revision 1.16
212 retrieving revision 1.17
213 diff -u -r1.16 -r1.17
214 --- doxygen-1.5.4.ebuild 12 Oct 2008 01:49:49 -0000 1.16
215 +++ doxygen-1.5.4.ebuild 30 May 2009 08:19:53 -0000 1.17
216 @@ -1,6 +1,6 @@
217 -# Copyright 1999-2008 Gentoo Foundation
218 +# Copyright 1999-2009 Gentoo Foundation
219 # Distributed under the terms of the GNU General Public License v2
220 -# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.4.ebuild,v 1.16 2008/10/12 01:49:49 nerdboy Exp $
221 +# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.4.ebuild,v 1.17 2009/05/30 08:19:53 ulm Exp $
222
223 EAPI=1
224
225 @@ -16,13 +16,10 @@
226 IUSE="debug doc nodot qt3 latex elibc_FreeBSD"
227
228 RDEPEND="qt3? ( x11-libs/qt:3 )
229 - latex? ( || (
230 - ( app-text/texlive-core
231 + latex? ( app-text/texlive-core
232 dev-texlive/texlive-latexrecommended
233 dev-texlive/texlive-genericrecommended
234 dev-texlive/texlive-fontsrecommended )
235 - ( app-text/tetex ) )
236 - )
237 dev-lang/python
238 virtual/libiconv
239 virtual/ghostscript
240 @@ -39,10 +36,10 @@
241
242 # use CFLAGS, CXXFLAGS, LDFLAGS
243 sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \
244 - -e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \
245 - -e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \
246 - tmake/lib/{{linux,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++}/tmake.conf \
247 - || die "sed failed"
248 + -e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \
249 + -e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \
250 + tmake/lib/{{linux,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++}/tmake.conf \
251 + || die "sed failed"
252
253 # Ensure we link to -liconv
254 if use elibc_FreeBSD; then
255 @@ -59,18 +56,18 @@
256 epatch "${FILESDIR}/${PN}-1.5-system-libpng.patch"
257
258 if [ $(get_libdir) == "lib64" ] ; then
259 - epatch "${FILESDIR}/${PN}-1.5-qtlibdir.patch"
260 + epatch "${FILESDIR}/${PN}-1.5-qtlibdir.patch"
261 fi
262
263 if is-flagq "-O3" ; then
264 - echo
265 - ewarn "Compiling with -O3 is known to produce incorrectly"
266 - ewarn "optimized code which breaks doxygen."
267 - echo
268 - epause 6
269 - elog "Continuing with -O2 instead ..."
270 - echo
271 - replace-flags "-O3" "-O2"
272 + echo
273 + ewarn "Compiling with -O3 is known to produce incorrectly"
274 + ewarn "optimized code which breaks doxygen."
275 + echo
276 + epause 6
277 + elog "Continuing with -O2 instead ..."
278 + echo
279 + replace-flags "-O3" "-O2"
280 fi
281 }
282
283 @@ -79,52 +76,52 @@
284 # set ./configure options (prefix, Qt based wizard, docdir)
285
286 if use debug; then
287 - local my_conf="--prefix ${D}usr --debug"
288 + local my_conf="--prefix ${D}usr --debug"
289 else
290 - local my_conf="--prefix ${D}usr"
291 + local my_conf="--prefix ${D}usr"
292 fi
293
294 if use qt3; then
295 - einfo "using QTDIR: '$QTDIR'."
296 - export LD_LIBRARY_PATH=${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}
297 - export LIBRARY_PATH=${QTDIR}/$(get_libdir):${LIBRARY_PATH}
298 - einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
299 - einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
300 - ./configure ${my_conf} $(use_with qt3 doxywizard) \
301 + einfo "using QTDIR: '$QTDIR'."
302 + export LD_LIBRARY_PATH=${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}
303 + export LIBRARY_PATH=${QTDIR}/$(get_libdir):${LIBRARY_PATH}
304 + einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
305 + einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
306 + ./configure ${my_conf} $(use_with qt3 doxywizard) \
307 || die 'configure with qt3 failed'
308 else
309 - ./configure ${my_conf} || die 'configure failed'
310 + ./configure ${my_conf} || die 'configure failed'
311 fi
312
313 # and compile
314 emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)" \
315 - LINK_SHLIB="$(tc-getCXX)" all || die 'emake failed'
316 + LINK_SHLIB="$(tc-getCXX)" all || die 'emake failed'
317
318 # generate html and pdf (if tetex in use) documents.
319 # errors here are not considered fatal, hence the ewarn message
320 # TeX's font caching in /var/cache/fonts causes sandbox warnings,
321 # so we allow it.
322 if use doc; then
323 - if use nodot; then
324 + if use nodot; then
325 sed -i -e "s/HAVE_DOT = YES/HAVE_DOT = NO/" \
326 - {Doxyfile,doc/Doxyfile} || ewarn "disabling dot failed"
327 - fi
328 - if use latex; then
329 + {Doxyfile,doc/Doxyfile} || ewarn "disabling dot failed"
330 + fi
331 + if use latex; then
332 addwrite /var/cache/fonts
333 addwrite /var/cache/fontconfig
334 addwrite /usr/share/texmf/fonts/pk
335 addwrite /usr/share/texmf/ls-R
336 make pdf || ewarn '"make pdf docs" failed.'
337 - else
338 + else
339 cp doc/Doxyfile doc/Doxyfile.orig
340 cp doc/Makefile doc/Makefile.orig
341 sed -i.orig -e "s/GENERATE_LATEX = YES/GENERATE_LATEX = NO/" \
342 - doc/Doxyfile
343 + doc/Doxyfile
344 sed -i.orig -e "s/@epstopdf/# @epstopdf/" \
345 - -e "s/@cp Makefile.latex/# @cp Makefile.latex/" \
346 - -e "s/@sed/# @sed/" doc/Makefile
347 + -e "s/@cp Makefile.latex/# @cp Makefile.latex/" \
348 + -e "s/@sed/# @sed/" doc/Makefile
349 make docs || ewarn '"make html docs" failed.'
350 - fi
351 + fi
352 fi
353 }
354
355 @@ -133,8 +130,8 @@
356 install || die '"make install" failed.'
357
358 if use qt3; then
359 - doicon "${FILESDIR}/doxywizard.png"
360 - make_desktop_entry doxywizard "DoxyWizard ${PV}" \
361 + doicon "${FILESDIR}/doxywizard.png"
362 + make_desktop_entry doxywizard "DoxyWizard ${PV}" \
363 "doxywizard.png" "Application;Development"
364 fi
365
366 @@ -142,11 +139,11 @@
367
368 # pdf and html manuals
369 if use doc; then
370 - insinto /usr/share/doc/${PF}
371 - if use latex; then
372 + insinto /usr/share/doc/${PF}
373 + if use latex; then
374 doins latex/doxygen_manual.pdf
375 - fi
376 - dohtml -r html/*
377 + fi
378 + dohtml -r html/*
379 fi
380 }
381
382
383
384
385 1.4 app-doc/doxygen/doxygen-1.5.7.1.ebuild
386
387 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/doxygen-1.5.7.1.ebuild?rev=1.4&view=markup
388 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/doxygen-1.5.7.1.ebuild?rev=1.4&content-type=text/plain
389 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/doxygen-1.5.7.1.ebuild?r1=1.3&r2=1.4
390
391 Index: doxygen-1.5.7.1.ebuild
392 ===================================================================
393 RCS file: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.7.1.ebuild,v
394 retrieving revision 1.3
395 retrieving revision 1.4
396 diff -u -r1.3 -r1.4
397 --- doxygen-1.5.7.1.ebuild 24 Dec 2008 02:18:09 -0000 1.3
398 +++ doxygen-1.5.7.1.ebuild 30 May 2009 08:19:53 -0000 1.4
399 @@ -1,6 +1,6 @@
400 -# Copyright 1999-2008 Gentoo Foundation
401 +# Copyright 1999-2009 Gentoo Foundation
402 # Distributed under the terms of the GNU General Public License v2
403 -# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.7.1.ebuild,v 1.3 2008/12/24 02:18:09 nerdboy Exp $
404 +# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.7.1.ebuild,v 1.4 2009/05/30 08:19:53 ulm Exp $
405
406 EAPI=1
407
408 @@ -16,14 +16,11 @@
409 IUSE="debug doc nodot qt3 latex elibc_FreeBSD"
410
411 RDEPEND="qt3? ( x11-libs/qt:3 )
412 - latex? ( || (
413 - ( app-text/texlive-core
414 + latex? ( app-text/texlive-core
415 dev-texlive/texlive-genericrecommended
416 dev-texlive/texlive-fontsrecommended
417 dev-texlive/texlive-latexrecommended
418 dev-texlive/texlive-latexextra )
419 - ( app-text/tetex ) )
420 - )
421 dev-lang/python
422 virtual/libiconv
423 media-libs/libpng
424
425
426
427 1.4 app-doc/doxygen/doxygen-1.5.8.ebuild
428
429 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/doxygen-1.5.8.ebuild?rev=1.4&view=markup
430 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/doxygen-1.5.8.ebuild?rev=1.4&content-type=text/plain
431 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/doxygen-1.5.8.ebuild?r1=1.3&r2=1.4
432
433 Index: doxygen-1.5.8.ebuild
434 ===================================================================
435 RCS file: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.8.ebuild,v
436 retrieving revision 1.3
437 retrieving revision 1.4
438 diff -u -r1.3 -r1.4
439 --- doxygen-1.5.8.ebuild 4 Feb 2009 14:53:34 -0000 1.3
440 +++ doxygen-1.5.8.ebuild 30 May 2009 08:19:53 -0000 1.4
441 @@ -1,6 +1,6 @@
442 # Copyright 1999-2009 Gentoo Foundation
443 # Distributed under the terms of the GNU General Public License v2
444 -# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.8.ebuild,v 1.3 2009/02/04 14:53:34 yngwin Exp $
445 +# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.8.ebuild,v 1.4 2009/05/30 08:19:53 ulm Exp $
446
447 EAPI=1
448
449 @@ -16,14 +16,11 @@
450 IUSE="debug doc nodot qt4 latex elibc_FreeBSD"
451
452 RDEPEND="qt4? ( x11-libs/qt-gui:4 )
453 - latex? ( || (
454 - ( app-text/texlive-core
455 + latex? ( app-text/texlive-core
456 dev-texlive/texlive-genericrecommended
457 dev-texlive/texlive-fontsrecommended
458 dev-texlive/texlive-latexrecommended
459 dev-texlive/texlive-latexextra )
460 - ( app-text/tetex ) )
461 - )
462 dev-lang/python
463 virtual/libiconv
464 media-libs/libpng
465
466
467
468 1.158 app-doc/doxygen/ChangeLog
469
470 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/ChangeLog?rev=1.158&view=markup
471 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/ChangeLog?rev=1.158&content-type=text/plain
472 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/ChangeLog?r1=1.157&r2=1.158
473
474 Index: ChangeLog
475 ===================================================================
476 RCS file: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v
477 retrieving revision 1.157
478 retrieving revision 1.158
479 diff -u -r1.157 -r1.158
480 --- ChangeLog 4 Feb 2009 14:53:34 -0000 1.157
481 +++ ChangeLog 30 May 2009 08:19:53 -0000 1.158
482 @@ -1,6 +1,11 @@
483 # ChangeLog for app-doc/doxygen
484 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
485 -# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.157 2009/02/04 14:53:34 yngwin Exp $
486 +# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.158 2009/05/30 08:19:53 ulm Exp $
487 +
488 + 30 May 2009; Ulrich Mueller <ulm@g.o> doxygen-1.4.7.ebuild,
489 + doxygen-1.5.4.ebuild, doxygen-1.5.5.ebuild, doxygen-1.5.6.ebuild,
490 + doxygen-1.5.7.1.ebuild, doxygen-1.5.8.ebuild:
491 + Remove app-text/tetex from dependencies, bug 227443.
492
493 04 Feb 2009; Ben de Groot <yngwin@g.o> doxygen-1.5.8:
494 Correct qt:4 dep to use split deps
495 @@ -28,7 +33,7 @@
496 Updated latex depends for bugs 237960 and 241350 since the virtual does
497 not seem to be working very well for people. Added several deps for
498 texlive; thanks to mephinet <mephinet@×××.net> and <gengor@g.o>
499 - for helping to track down some of the needed depends (this latex/tetex
500 + for helping to track down some of the needed depends (this latex/tetex
501 thing is painful).
502
503 02 Sep 2008; Christian Faulhammer <opfer@g.o>
504 @@ -241,7 +246,7 @@
505 +files/1.4.7/06_all_qtools.patch, +doxygen-1.4.7.ebuild:
506 Version bump for bug #137283, need arch testing and graphviz answers (see
507 bug #134575) before package cleanup can occur. Filed bug #138937 on the
508 - doxygen stablization issue. Thanks to Adam Piatyszek for providing the
509 + doxygen stablization issue. Thanks to Adam Piatyszek for providing the
510 updated ebuild and patches.
511
512 24 Jun 2006; Doug Goldstein <cardoe@g.o> doxygen-1.4.2.ebuild,
513 @@ -395,7 +400,7 @@
514 30 May 2005; Steve Arnold <nerdboy@g.o>
515 +files/doxygen-1.4.3-cp1251.patch, doxygen-1.4.2.ebuild,
516 +doxygen-1.4.3.ebuild:
517 - new version for bug 92789, patch for bug 85668, and stable bumps on
518 + new version for bug 92789, patch for bug 85668, and stable bumps on
519 covered arches. Also added brute-force workaround for bug 89075.
520
521 15 May 2005; Fernando J. Pereda <ferdy@g.o> doxygen-1.4.1.ebuild:
522 @@ -669,11 +674,11 @@
523
524 17 Apr 2002; Ryan Phillips <rphillips@g.o> ChangeLog :
525 Copied 1.2.13.1 ebuild over for 1.2.15 (#1786)
526 -
527 +
528 *doxygen-1.2.13.1 (1 Feb 2002)
529
530 1 Feb 2002; G.Bevin <gbevin@g.o> ChangeLog :
531 -
532 +
533 Added initial ChangeLog which should be updated whenever the package is
534 updated in any way. This changelog is targetted to users. This means that the
535 comments should well explained and written in clean English. The details about
536
537
538
539 1.27 app-doc/doxygen/doxygen-1.4.7.ebuild
540
541 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/doxygen-1.4.7.ebuild?rev=1.27&view=markup
542 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/doxygen-1.4.7.ebuild?rev=1.27&content-type=text/plain
543 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/doxygen-1.4.7.ebuild?r1=1.26&r2=1.27
544
545 Index: doxygen-1.4.7.ebuild
546 ===================================================================
547 RCS file: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.7.ebuild,v
548 retrieving revision 1.26
549 retrieving revision 1.27
550 diff -u -r1.26 -r1.27
551 --- doxygen-1.4.7.ebuild 12 Oct 2008 01:49:49 -0000 1.26
552 +++ doxygen-1.4.7.ebuild 30 May 2009 08:19:53 -0000 1.27
553 @@ -1,6 +1,6 @@
554 -# Copyright 1999-2008 Gentoo Foundation
555 +# Copyright 1999-2009 Gentoo Foundation
556 # Distributed under the terms of the GNU General Public License v2
557 -# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.7.ebuild,v 1.26 2008/10/12 01:49:49 nerdboy Exp $
558 +# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.7.ebuild,v 1.27 2009/05/30 08:19:53 ulm Exp $
559
560 EAPI=1
561
562 @@ -18,13 +18,10 @@
563
564 RDEPEND=">=media-gfx/graphviz-2.6
565 qt3? ( x11-libs/qt:3 )
566 - latex? ( || (
567 - ( app-text/texlive-core
568 + latex? ( app-text/texlive-core
569 dev-texlive/texlive-latexrecommended
570 dev-texlive/texlive-genericrecommended
571 dev-texlive/texlive-fontsrecommended )
572 - ( app-text/tetex ) )
573 - )
574 virtual/ghostscript"
575 DEPEND=">=sys-apps/sed-4
576 ${RDEPEND}"
577
578
579
580 1.3 app-doc/doxygen/doxygen-1.5.6.ebuild
581
582 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/doxygen-1.5.6.ebuild?rev=1.3&view=markup
583 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/doxygen-1.5.6.ebuild?rev=1.3&content-type=text/plain
584 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/doxygen-1.5.6.ebuild?r1=1.2&r2=1.3
585
586 Index: doxygen-1.5.6.ebuild
587 ===================================================================
588 RCS file: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.6.ebuild,v
589 retrieving revision 1.2
590 retrieving revision 1.3
591 diff -u -r1.2 -r1.3
592 --- doxygen-1.5.6.ebuild 12 Oct 2008 01:49:49 -0000 1.2
593 +++ doxygen-1.5.6.ebuild 30 May 2009 08:19:53 -0000 1.3
594 @@ -1,6 +1,6 @@
595 -# Copyright 1999-2008 Gentoo Foundation
596 +# Copyright 1999-2009 Gentoo Foundation
597 # Distributed under the terms of the GNU General Public License v2
598 -# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.6.ebuild,v 1.2 2008/10/12 01:49:49 nerdboy Exp $
599 +# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.6.ebuild,v 1.3 2009/05/30 08:19:53 ulm Exp $
600
601 EAPI=1
602
603 @@ -16,13 +16,10 @@
604 IUSE="debug doc nodot qt3 latex elibc_FreeBSD"
605
606 RDEPEND="qt3? ( x11-libs/qt:3 )
607 - latex? ( || (
608 - ( app-text/texlive-core
609 + latex? ( app-text/texlive-core
610 dev-texlive/texlive-latexrecommended
611 dev-texlive/texlive-genericrecommended
612 dev-texlive/texlive-fontsrecommended )
613 - ( app-text/tetex ) )
614 - )
615 dev-lang/python
616 virtual/libiconv
617 media-libs/libpng
618 @@ -40,16 +37,16 @@
619
620 # use CFLAGS, CXXFLAGS, LDFLAGS
621 sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \
622 - -e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \
623 - -e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \
624 - tmake/lib/{{linux,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++}/tmake.conf \
625 - || die "sed failed"
626 + -e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \
627 + -e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \
628 + tmake/lib/{{linux,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++}/tmake.conf \
629 + || die "sed failed"
630
631 # Ensure we link to -liconv
632 if use elibc_FreeBSD; then
633 - for pro in */*.pro.in */*/*.pro.in; do
634 + for pro in */*.pro.in */*/*.pro.in; do
635 echo "unix:LIBS += -liconv" >> "${pro}"
636 - done
637 + done
638 fi
639
640 # Consolidate patches, apply FreeBSD configure patch, codepage patch,
641 @@ -60,18 +57,18 @@
642 epatch "${FILESDIR}/${PN}-1.5-system-libpng.patch"
643
644 if [ $(get_libdir) == "lib64" ] ; then
645 - epatch "${FILESDIR}/${PN}-1.5-qtlibdir.patch"
646 + epatch "${FILESDIR}/${PN}-1.5-qtlibdir.patch"
647 fi
648
649 if is-flagq "-O3" ; then
650 - echo
651 - ewarn "Compiling with -O3 is known to produce incorrectly"
652 - ewarn "optimized code which breaks doxygen."
653 - echo
654 - epause 6
655 - elog "Continuing with -O2 instead ..."
656 - echo
657 - replace-flags "-O3" "-O2"
658 + echo
659 + ewarn "Compiling with -O3 is known to produce incorrectly"
660 + ewarn "optimized code which breaks doxygen."
661 + echo
662 + epause 6
663 + elog "Continuing with -O2 instead ..."
664 + echo
665 + replace-flags "-O3" "-O2"
666 fi
667 }
668
669 @@ -81,52 +78,52 @@
670
671 local my_conf=""
672 if use debug; then
673 - my_conf="--prefix ${D}usr --debug"
674 + my_conf="--prefix ${D}usr --debug"
675 else
676 - my_conf="--prefix ${D}usr"
677 + my_conf="--prefix ${D}usr"
678 fi
679
680 if use qt3; then
681 - einfo "using QTDIR: '$QTDIR'."
682 - export LIBRARY_PATH="${QTDIR}/$(get_libdir):${LIBRARY_PATH}"
683 - export LD_LIBRARY_PATH="${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}"
684 - einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
685 - einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
686 - ./configure ${my_conf} $(use_with qt3 doxywizard) \
687 + einfo "using QTDIR: '$QTDIR'."
688 + export LIBRARY_PATH="${QTDIR}/$(get_libdir):${LIBRARY_PATH}"
689 + export LD_LIBRARY_PATH="${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}"
690 + einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
691 + einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
692 + ./configure ${my_conf} $(use_with qt3 doxywizard) \
693 || die 'configure with qt3 failed'
694 else
695 - ./configure ${my_conf} || die 'configure failed'
696 + ./configure ${my_conf} || die 'configure failed'
697 fi
698
699 # and compile
700 emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)" \
701 - LINK_SHLIB="$(tc-getCXX)" all || die 'emake failed'
702 + LINK_SHLIB="$(tc-getCXX)" all || die 'emake failed'
703
704 # generate html and pdf (if tetex in use) documents.
705 # errors here are not considered fatal, hence the ewarn message
706 # TeX's font caching in /var/cache/fonts causes sandbox warnings,
707 # so we allow it.
708 if use doc; then
709 - if use nodot; then
710 + if use nodot; then
711 sed -i -e "s/HAVE_DOT = YES/HAVE_DOT = NO/" \
712 - {Doxyfile,doc/Doxyfile} || ewarn "disabling dot failed"
713 - fi
714 - if use latex; then
715 + {Doxyfile,doc/Doxyfile} || ewarn "disabling dot failed"
716 + fi
717 + if use latex; then
718 addwrite /var/cache/fonts
719 addwrite /var/cache/fontconfig
720 addwrite /usr/share/texmf/fonts/pk
721 addwrite /usr/share/texmf/ls-R
722 make pdf || ewarn '"make pdf docs" failed.'
723 - else
724 + else
725 cp doc/Doxyfile doc/Doxyfile.orig
726 cp doc/Makefile doc/Makefile.orig
727 sed -i.orig -e "s/GENERATE_LATEX = YES/GENERATE_LATEX = NO/" \
728 - doc/Doxyfile
729 + doc/Doxyfile
730 sed -i.orig -e "s/@epstopdf/# @epstopdf/" \
731 - -e "s/@cp Makefile.latex/# @cp Makefile.latex/" \
732 - -e "s/@sed/# @sed/" doc/Makefile
733 + -e "s/@cp Makefile.latex/# @cp Makefile.latex/" \
734 + -e "s/@sed/# @sed/" doc/Makefile
735 make docs || ewarn '"make html docs" failed.'
736 - fi
737 + fi
738 fi
739 }
740
741 @@ -135,8 +132,8 @@
742 install || die '"make install" failed.'
743
744 if use qt3; then
745 - doicon "${FILESDIR}/doxywizard.png"
746 - make_desktop_entry doxywizard "DoxyWizard ${PV}" \
747 + doicon "${FILESDIR}/doxywizard.png"
748 + make_desktop_entry doxywizard "DoxyWizard ${PV}" \
749 "doxywizard.png" "Application;Development"
750 fi
751
752 @@ -144,11 +141,11 @@
753
754 # pdf and html manuals
755 if use doc; then
756 - insinto /usr/share/doc/"${PF}"
757 - if use latex; then
758 + insinto /usr/share/doc/"${PF}"
759 + if use latex; then
760 doins latex/doxygen_manual.pdf
761 - fi
762 - dohtml -r html/*
763 + fi
764 + dohtml -r html/*
765 fi
766 }