1 |
nerdboy 10/10/02 18:21:55 |
2 |
|
3 |
Modified: ChangeLog doxygen-1.5.8-r1.ebuild |
4 |
Log: |
5 |
Updated LDFLAGS and EAPI for QA bug 336736. |
6 |
|
7 |
(Portage version: 2.2_rc88/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.180 app-doc/doxygen/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/ChangeLog?rev=1.180&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/ChangeLog?rev=1.180&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/ChangeLog?r1=1.179&r2=1.180 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v |
19 |
retrieving revision 1.179 |
20 |
retrieving revision 1.180 |
21 |
diff -u -r1.179 -r1.180 |
22 |
--- ChangeLog 29 Sep 2010 02:34:43 -0000 1.179 |
23 |
+++ ChangeLog 2 Oct 2010 18:21:55 -0000 1.180 |
24 |
@@ -1,6 +1,9 @@ |
25 |
# ChangeLog for app-doc/doxygen |
26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.179 2010/09/29 02:34:43 nerdboy Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.180 2010/10/02 18:21:55 nerdboy Exp $ |
29 |
+ |
30 |
+ 02 Oct 2010; Steve Arnold <nerdboy@g.o> doxygen-1.5.8-r1.ebuild: |
31 |
+ Updated LDFLAGS and EAPI; closes QA bug #336736. |
32 |
|
33 |
29 Sep 2010; Steve Arnold <nerdboy@g.o> doxygen-1.7.1.ebuild: |
34 |
Added minor upstream latex doc fix (only affects package PDF docs). |
35 |
|
36 |
|
37 |
|
38 |
1.8 app-doc/doxygen/doxygen-1.5.8-r1.ebuild |
39 |
|
40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/doxygen-1.5.8-r1.ebuild?rev=1.8&view=markup |
41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/doxygen-1.5.8-r1.ebuild?rev=1.8&content-type=text/plain |
42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/doxygen-1.5.8-r1.ebuild?r1=1.7&r2=1.8 |
43 |
|
44 |
Index: doxygen-1.5.8-r1.ebuild |
45 |
=================================================================== |
46 |
RCS file: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.8-r1.ebuild,v |
47 |
retrieving revision 1.7 |
48 |
retrieving revision 1.8 |
49 |
diff -u -r1.7 -r1.8 |
50 |
--- doxygen-1.5.8-r1.ebuild 8 Mar 2010 07:15:06 -0000 1.7 |
51 |
+++ doxygen-1.5.8-r1.ebuild 2 Oct 2010 18:21:55 -0000 1.8 |
52 |
@@ -1,10 +1,10 @@ |
53 |
# Copyright 1999-2010 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.8-r1.ebuild,v 1.7 2010/03/08 07:15:06 nerdboy Exp $ |
56 |
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.8-r1.ebuild,v 1.8 2010/10/02 18:21:55 nerdboy Exp $ |
57 |
|
58 |
-EAPI=1 |
59 |
+EAPI=2 |
60 |
|
61 |
-inherit eutils flag-o-matic toolchain-funcs qt4 fdo-mime |
62 |
+inherit eutils flag-o-matic toolchain-funcs qt4-r2 fdo-mime |
63 |
|
64 |
DESCRIPTION="documentation system for C++, C, Java, Objective-C, Python, IDL, and other languages" |
65 |
HOMEPAGE="http://www.doxygen.org/" |
66 |
@@ -34,10 +34,7 @@ |
67 |
|
68 |
EPATCH_SUFFIX="patch" |
69 |
|
70 |
-src_unpack() { |
71 |
- unpack ${A} |
72 |
- cd "${S}" |
73 |
- |
74 |
+src_prepare() { |
75 |
# use CFLAGS, CXXFLAGS, LDFLAGS |
76 |
sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \ |
77 |
-e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \ |
78 |
@@ -77,7 +74,7 @@ |
79 |
fi |
80 |
} |
81 |
|
82 |
-src_compile() { |
83 |
+src_configure() { |
84 |
export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}" |
85 |
# set ./configure options (prefix, Qt based wizard, docdir) |
86 |
|
87 |
@@ -105,9 +102,11 @@ |
88 |
else |
89 |
./configure ${my_conf} || die 'configure failed' |
90 |
fi |
91 |
+} |
92 |
|
93 |
+src_compile() { |
94 |
# and compile |
95 |
- emake all || die 'emake failed' |
96 |
+ emake LDFLAGS="${LDFLAGS}" all || die 'emake failed' |
97 |
|
98 |
# generate html and pdf (if tetex in use) documents. |
99 |
# errors here are not considered fatal, hence the ewarn message |