1 |
flameeyes 08/11/04 09:49:03 |
2 |
|
3 |
Modified: doxygen-1.5.7.1.ebuild ChangeLog |
4 |
Log: |
5 |
Add flex dependency. |
6 |
(Portage version: 2.2_rc13/cvs/Linux 2.6.27-gentoo-r2 x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.2 app-doc/doxygen/doxygen-1.5.7.1.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/doxygen-1.5.7.1.ebuild?rev=1.2&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/doxygen-1.5.7.1.ebuild?rev=1.2&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/doxygen-1.5.7.1.ebuild?r1=1.1&r2=1.2 |
14 |
|
15 |
Index: doxygen-1.5.7.1.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.7.1.ebuild,v |
18 |
retrieving revision 1.1 |
19 |
retrieving revision 1.2 |
20 |
diff -u -r1.1 -r1.2 |
21 |
--- doxygen-1.5.7.1.ebuild 2 Nov 2008 21:16:57 -0000 1.1 |
22 |
+++ doxygen-1.5.7.1.ebuild 4 Nov 2008 09:49:03 -0000 1.2 |
23 |
@@ -1,6 +1,6 @@ |
24 |
# Copyright 1999-2008 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.7.1.ebuild,v 1.1 2008/11/02 21:16:57 nerdboy Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.7.1.ebuild,v 1.2 2008/11/04 09:49:03 flameeyes Exp $ |
28 |
|
29 |
EAPI=1 |
30 |
|
31 |
@@ -31,6 +31,7 @@ |
32 |
!nodot? ( >=media-gfx/graphviz-2.6 |
33 |
media-libs/freetype )" |
34 |
DEPEND=">=sys-apps/sed-4 |
35 |
+ sys-devel/flex |
36 |
${RDEPEND}" |
37 |
|
38 |
EPATCH_SUFFIX="patch" |
39 |
@@ -41,16 +42,16 @@ |
40 |
|
41 |
# use CFLAGS, CXXFLAGS, LDFLAGS |
42 |
sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \ |
43 |
- -e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \ |
44 |
- -e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \ |
45 |
- tmake/lib/{{linux,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++}/tmake.conf \ |
46 |
- || die "sed failed" |
47 |
+ -e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \ |
48 |
+ -e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \ |
49 |
+ tmake/lib/{{linux,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++}/tmake.conf \ |
50 |
+ || die "sed failed" |
51 |
|
52 |
# Ensure we link to -liconv |
53 |
if use elibc_FreeBSD; then |
54 |
- for pro in */*.pro.in */*/*.pro.in; do |
55 |
+ for pro in */*.pro.in */*/*.pro.in; do |
56 |
echo "unix:LIBS += -liconv" >> "${pro}" |
57 |
- done |
58 |
+ done |
59 |
fi |
60 |
|
61 |
# Consolidate patches, apply FreeBSD configure patch, codepage patch, |
62 |
@@ -61,22 +62,22 @@ |
63 |
epatch "${FILESDIR}/${PN}-1.5-system-libpng.patch" |
64 |
|
65 |
if [ $(get_libdir) == "lib64" ] ; then |
66 |
- epatch "${FILESDIR}/${PN}-1.5-qtlibdir.patch" |
67 |
+ epatch "${FILESDIR}/${PN}-1.5-qtlibdir.patch" |
68 |
fi |
69 |
|
70 |
# fix final DESTDIR issue |
71 |
sed -i.orig -e "s:\$(INSTALL):\$(DESTDIR)/\$(INSTALL):g" \ |
72 |
- addon/doxywizard/Makefile.in || die "sed failed" |
73 |
+ addon/doxywizard/Makefile.in || die "sed failed" |
74 |
|
75 |
if is-flagq "-O3" ; then |
76 |
- echo |
77 |
- ewarn "Compiling with -O3 is known to produce incorrectly" |
78 |
- ewarn "optimized code which breaks doxygen." |
79 |
- echo |
80 |
- epause 6 |
81 |
- elog "Continuing with -O2 instead ..." |
82 |
- echo |
83 |
- replace-flags "-O3" "-O2" |
84 |
+ echo |
85 |
+ ewarn "Compiling with -O3 is known to produce incorrectly" |
86 |
+ ewarn "optimized code which breaks doxygen." |
87 |
+ echo |
88 |
+ epause 6 |
89 |
+ elog "Continuing with -O2 instead ..." |
90 |
+ echo |
91 |
+ replace-flags "-O3" "-O2" |
92 |
fi |
93 |
} |
94 |
|
95 |
@@ -86,52 +87,52 @@ |
96 |
|
97 |
local my_conf="" |
98 |
if use debug; then |
99 |
- my_conf="--prefix /usr --debug" |
100 |
+ my_conf="--prefix /usr --debug" |
101 |
else |
102 |
- my_conf="--prefix /usr" |
103 |
+ my_conf="--prefix /usr" |
104 |
fi |
105 |
|
106 |
if use qt3; then |
107 |
- einfo "using QTDIR: '$QTDIR'." |
108 |
- export LIBRARY_PATH="${QTDIR}/$(get_libdir):${LIBRARY_PATH}" |
109 |
- export LD_LIBRARY_PATH="${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}" |
110 |
- einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'." |
111 |
- einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'." |
112 |
- ./configure ${my_conf} $(use_with qt3 doxywizard) \ |
113 |
+ einfo "using QTDIR: '$QTDIR'." |
114 |
+ export LIBRARY_PATH="${QTDIR}/$(get_libdir):${LIBRARY_PATH}" |
115 |
+ export LD_LIBRARY_PATH="${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}" |
116 |
+ einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'." |
117 |
+ einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'." |
118 |
+ ./configure ${my_conf} $(use_with qt3 doxywizard) \ |
119 |
|| die 'configure with qt3 failed' |
120 |
else |
121 |
- ./configure ${my_conf} || die 'configure failed' |
122 |
+ ./configure ${my_conf} || die 'configure failed' |
123 |
fi |
124 |
|
125 |
# and compile |
126 |
emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)" \ |
127 |
- LINK_SHLIB="$(tc-getCXX)" all || die 'emake failed' |
128 |
+ LINK_SHLIB="$(tc-getCXX)" all || die 'emake failed' |
129 |
|
130 |
# generate html and pdf (if tetex in use) documents. |
131 |
# errors here are not considered fatal, hence the ewarn message |
132 |
# TeX's font caching in /var/cache/fonts causes sandbox warnings, |
133 |
# so we allow it. |
134 |
if use doc; then |
135 |
- if use nodot; then |
136 |
+ if use nodot; then |
137 |
sed -i -e "s/HAVE_DOT = YES/HAVE_DOT = NO/" \ |
138 |
- {Doxyfile,doc/Doxyfile} || ewarn "disabling dot failed" |
139 |
- fi |
140 |
- if use latex; then |
141 |
+ {Doxyfile,doc/Doxyfile} || ewarn "disabling dot failed" |
142 |
+ fi |
143 |
+ if use latex; then |
144 |
addwrite /var/cache/fonts |
145 |
addwrite /var/cache/fontconfig |
146 |
addwrite /usr/share/texmf/fonts/pk |
147 |
addwrite /usr/share/texmf/ls-R |
148 |
make pdf || ewarn '"make pdf docs" failed.' |
149 |
- else |
150 |
+ else |
151 |
cp doc/Doxyfile doc/Doxyfile.orig |
152 |
cp doc/Makefile doc/Makefile.orig |
153 |
sed -i.orig -e "s/GENERATE_LATEX = YES/GENERATE_LATEX = NO/" \ |
154 |
- doc/Doxyfile |
155 |
+ doc/Doxyfile |
156 |
sed -i.orig -e "s/@epstopdf/# @epstopdf/" \ |
157 |
- -e "s/@cp Makefile.latex/# @cp Makefile.latex/" \ |
158 |
- -e "s/@sed/# @sed/" doc/Makefile |
159 |
+ -e "s/@cp Makefile.latex/# @cp Makefile.latex/" \ |
160 |
+ -e "s/@sed/# @sed/" doc/Makefile |
161 |
make docs || ewarn '"make html docs" failed.' |
162 |
- fi |
163 |
+ fi |
164 |
fi |
165 |
} |
166 |
|
167 |
@@ -140,8 +141,8 @@ |
168 |
install || die '"make install" failed.' |
169 |
|
170 |
if use qt3; then |
171 |
- doicon "${FILESDIR}/doxywizard.png" |
172 |
- make_desktop_entry doxywizard "DoxyWizard ${PV}" \ |
173 |
+ doicon "${FILESDIR}/doxywizard.png" |
174 |
+ make_desktop_entry doxywizard "DoxyWizard ${PV}" \ |
175 |
"doxywizard.png" "Application;Development" |
176 |
fi |
177 |
|
178 |
@@ -149,11 +150,11 @@ |
179 |
|
180 |
# pdf and html manuals |
181 |
if use doc; then |
182 |
- insinto /usr/share/doc/"${PF}" |
183 |
- if use latex; then |
184 |
+ insinto /usr/share/doc/"${PF}" |
185 |
+ if use latex; then |
186 |
doins latex/doxygen_manual.pdf |
187 |
- fi |
188 |
- dohtml -r html/* |
189 |
+ fi |
190 |
+ dohtml -r html/* |
191 |
fi |
192 |
} |
193 |
|
194 |
|
195 |
|
196 |
|
197 |
1.154 app-doc/doxygen/ChangeLog |
198 |
|
199 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/ChangeLog?rev=1.154&view=markup |
200 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/ChangeLog?rev=1.154&content-type=text/plain |
201 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/ChangeLog?r1=1.153&r2=1.154 |
202 |
|
203 |
Index: ChangeLog |
204 |
=================================================================== |
205 |
RCS file: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v |
206 |
retrieving revision 1.153 |
207 |
retrieving revision 1.154 |
208 |
diff -u -r1.153 -r1.154 |
209 |
--- ChangeLog 2 Nov 2008 21:16:57 -0000 1.153 |
210 |
+++ ChangeLog 4 Nov 2008 09:49:03 -0000 1.154 |
211 |
@@ -1,6 +1,9 @@ |
212 |
# ChangeLog for app-doc/doxygen |
213 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
214 |
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.153 2008/11/02 21:16:57 nerdboy Exp $ |
215 |
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.154 2008/11/04 09:49:03 flameeyes Exp $ |
216 |
+ |
217 |
+ 04 Nov 2008; Diego Pettenò <flameeyes@g.o> doxygen-1.5.7.1.ebuild: |
218 |
+ Add flex dependency. |
219 |
|
220 |
*doxygen-1.5.7.1 (02 Nov 2008) |