1 |
nerdboy 11/09/03 02:02:28 |
2 |
|
3 |
Modified: ChangeLog doxygen-1.7.4.ebuild |
4 |
Log: |
5 |
Newer (and cleaner) version using more of the qt4-r2 functionality. |
6 |
|
7 |
(Portage version: 2.1.10.11/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.205 app-doc/doxygen/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/ChangeLog?rev=1.205&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/ChangeLog?rev=1.205&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/ChangeLog?r1=1.204&r2=1.205 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v |
19 |
retrieving revision 1.204 |
20 |
retrieving revision 1.205 |
21 |
diff -u -r1.204 -r1.205 |
22 |
--- ChangeLog 3 Sep 2011 00:49:45 -0000 1.204 |
23 |
+++ ChangeLog 3 Sep 2011 02:02:28 -0000 1.205 |
24 |
@@ -1,6 +1,10 @@ |
25 |
# ChangeLog for app-doc/doxygen |
26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.204 2011/09/03 00:49:45 nerdboy Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.205 2011/09/03 02:02:28 nerdboy Exp $ |
29 |
+ |
30 |
+ 03 Sep 2011; Steve Arnold <nerdboy@g.o> doxygen-1.7.4.ebuild: |
31 |
+ Newer (and cleaner) version using more of the qt4-r2 functionality. |
32 |
+ Thanks to radhermit for bugging me about this... |
33 |
|
34 |
03 Sep 2011; Steve Arnold <nerdboy@g.o> doxygen-1.7.4.ebuild: |
35 |
More updates to force qmake to use the right config settings; should |
36 |
|
37 |
|
38 |
|
39 |
1.3 app-doc/doxygen/doxygen-1.7.4.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/doxygen-1.7.4.ebuild?rev=1.3&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/doxygen-1.7.4.ebuild?rev=1.3&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/doxygen-1.7.4.ebuild?r1=1.2&r2=1.3 |
44 |
|
45 |
Index: doxygen-1.7.4.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.7.4.ebuild,v |
48 |
retrieving revision 1.2 |
49 |
retrieving revision 1.3 |
50 |
diff -u -r1.2 -r1.3 |
51 |
--- doxygen-1.7.4.ebuild 3 Sep 2011 00:49:45 -0000 1.2 |
52 |
+++ doxygen-1.7.4.ebuild 3 Sep 2011 02:02:28 -0000 1.3 |
53 |
@@ -1,6 +1,6 @@ |
54 |
# Copyright 1999-2011 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.7.4.ebuild,v 1.2 2011/09/03 00:49:45 nerdboy Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.7.4.ebuild,v 1.3 2011/09/03 02:02:28 nerdboy Exp $ |
58 |
|
59 |
EAPI=3 |
60 |
|
61 |
@@ -49,7 +49,7 @@ |
62 |
fi |
63 |
|
64 |
# Call dot with -Teps instead of -Tps for EPS generation - bug #282150 |
65 |
- epatch "${FILESDIR}/${PN}-1.7.1-dot-eps.patch" |
66 |
+ epatch "${FILESDIR}"/${PN}-1.7.1-dot-eps.patch |
67 |
|
68 |
# prefix search tools patch, plus OSX fixes |
69 |
epatch "${FILESDIR}"/${PN}-1.5.6-prefix-misc-alt.patch |
70 |
@@ -62,10 +62,6 @@ |
71 |
sed -i.orig -e "s:g_kowal:g kowal:" \ |
72 |
doc/maintainers.txt || die "sed 3 failed" |
73 |
|
74 |
- # fix qmake spec problem |
75 |
-# sed -i.orig -e "s:spec macx-g++:spec gentoo:" \ |
76 |
-# addon/doxywizard/Makefile || die "sed 4 failed" |
77 |
- |
78 |
# add native TCL support |
79 |
use tcl && epatch "${WORKDIR}"/${PN}-1.7-tcl_support.patch |
80 |
|
81 |
@@ -83,43 +79,36 @@ |
82 |
src_configure() { |
83 |
# set ./configure options (prefix, Qt based wizard, docdir) |
84 |
|
85 |
- local my_conf="" |
86 |
- use debug && my_conf="--debug" |
87 |
+ local my_conf="--shared" |
88 |
+ |
89 |
+ if use debug ; then |
90 |
+ my_conf="${my_conf} --debug" |
91 |
+ else |
92 |
+ my_conf="${my_conf} --release " |
93 |
+ fi |
94 |
+ |
95 |
use ppc64 && my_conf="${my_conf} --english-only" #263641 |
96 |
|
97 |
+ use qt4 && my_conf="${my_conf} --with-doxywizard" |
98 |
+ |
99 |
export CC="${QMAKE_CC}" |
100 |
export CXX="${QMAKE_CXX}" |
101 |
export LINK="${QMAKE_LINK}" |
102 |
export LINK_SHLIB="${QMAKE_CXX}" |
103 |
|
104 |
- if use qt4; then |
105 |
- export QTDIR="${EPREFIX}/usr" |
106 |
- einfo "using QTDIR: '$QTDIR'." |
107 |
- export LIBRARY_PATH="${QTDIR}/$(get_libdir)${LIBRARY_PATH:+:}${LIBRARY_PATH}" |
108 |
- export LD_LIBRARY_PATH="${QTDIR}/$(get_libdir)${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}" |
109 |
- einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'." |
110 |
- einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'." |
111 |
- |
112 |
- ./configure --prefix "${EPREFIX}/usr" ${my_conf} $(use_with qt4 doxywizard) \ |
113 |
- || die 'configure with qt4 failed' |
114 |
- else |
115 |
- ./configure --prefix "${EPREFIX}/usr" ${my_conf} || die 'configure failed' |
116 |
- fi |
117 |
+ ./configure --prefix "${EPREFIX}/usr" ${my_conf} \ |
118 |
+ || die 'configure failed' |
119 |
} |
120 |
|
121 |
src_compile() { |
122 |
|
123 |
- # force stupid qmake to behave - yes, it's a big kluge... |
124 |
+ # force stupid qmake to behave - if it works... |
125 |
if use qt4 ; then |
126 |
- sed -i -e "s|\-Wl,\-O1 |\-Wl,\-O1 ${ELDFLAGS} |" \ |
127 |
- -e "s|= g++|= $(tc-getCXX)|" \ |
128 |
- -e "s|usr/local/Qt4.6|usr/share/qt4|g" \ |
129 |
- -e "s|macx-g++ -macx|linux-g++|" \ |
130 |
- addon/doxywizard/Makefile.doxywizard \ |
131 |
- || die "qmake sed hack failed" |
132 |
+ qt4-r2_src_compile |
133 |
+ else |
134 |
+ CFLAGS+="${ECFLAGS}" CXXFLAGS+="${ECXXFLAGS}" LFLAGS+="${ELDFLAGS}" \ |
135 |
+ emake all || die 'emake failed' |
136 |
fi |
137 |
- CFLAGS+="${ECFLAGS}" CXXFLAGS+="${ECXXFLAGS}" LFLAGS+="${ELDFLAGS}" \ |
138 |
- emake all || die 'emake failed' |
139 |
|
140 |
# generate html and pdf (if tetex in use) documents. |
141 |
# errors here are not considered fatal, hence the ewarn message |