| 1 |
nerdboy 10/10/04 06:10:38 |
| 2 |
|
| 3 |
Modified: ChangeLog doxygen-1.5.8-r1.ebuild |
| 4 |
Log: |
| 5 |
Needed additional updates to pick up the qt4 qmake config correctly. |
| 6 |
|
| 7 |
(Portage version: 2.2_rc88/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.181 app-doc/doxygen/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/ChangeLog?rev=1.181&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/ChangeLog?rev=1.181&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/ChangeLog?r1=1.180&r2=1.181 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v |
| 19 |
retrieving revision 1.180 |
| 20 |
retrieving revision 1.181 |
| 21 |
diff -u -r1.180 -r1.181 |
| 22 |
--- ChangeLog 2 Oct 2010 18:21:55 -0000 1.180 |
| 23 |
+++ ChangeLog 4 Oct 2010 06:10:38 -0000 1.181 |
| 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.180 2010/10/02 18:21:55 nerdboy Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.181 2010/10/04 06:10:38 nerdboy Exp $ |
| 29 |
+ |
| 30 |
+ 04 Oct 2010; Steve Arnold <nerdboy@g.o> doxygen-1.5.8-r1.ebuild: |
| 31 |
+ Needed additional updates to pick up the qt4 qmake config correctly. |
| 32 |
|
| 33 |
02 Oct 2010; Steve Arnold <nerdboy@g.o> doxygen-1.5.8-r1.ebuild: |
| 34 |
Updated LDFLAGS and EAPI; closes QA bug #336736. |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.9 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.9&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/doxygen-1.5.8-r1.ebuild?rev=1.9&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.8&r2=1.9 |
| 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.8 |
| 48 |
retrieving revision 1.9 |
| 49 |
diff -u -r1.8 -r1.9 |
| 50 |
--- doxygen-1.5.8-r1.ebuild 2 Oct 2010 18:21:55 -0000 1.8 |
| 51 |
+++ doxygen-1.5.8-r1.ebuild 4 Oct 2010 06:10:38 -0000 1.9 |
| 52 |
@@ -1,6 +1,6 @@ |
| 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.8 2010/10/02 18:21:55 nerdboy Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.8-r1.ebuild,v 1.9 2010/10/04 06:10:38 nerdboy Exp $ |
| 57 |
|
| 58 |
EAPI=2 |
| 59 |
|
| 60 |
@@ -35,12 +35,14 @@ |
| 61 |
EPATCH_SUFFIX="patch" |
| 62 |
|
| 63 |
src_prepare() { |
| 64 |
+ qt4-r2_src_prepare |
| 65 |
+ |
| 66 |
# use CFLAGS, CXXFLAGS, LDFLAGS |
| 67 |
sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \ |
| 68 |
-e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \ |
| 69 |
-e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \ |
| 70 |
tmake/lib/{{linux,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++}/tmake.conf \ |
| 71 |
- || die "sed failed" |
| 72 |
+ || die "sed 1 failed" |
| 73 |
|
| 74 |
# Ensure we link to -liconv |
| 75 |
if use elibc_FreeBSD; then |
| 76 |
@@ -60,7 +62,7 @@ |
| 77 |
|
| 78 |
# fix final DESTDIR issue |
| 79 |
sed -i.orig -e "s:\$(INSTALL):\$(DESTDIR)/\$(INSTALL):g" \ |
| 80 |
- addon/doxywizard/Makefile.in || die "sed failed" |
| 81 |
+ addon/doxywizard/Makefile.in || die "sed 2 failed" |
| 82 |
|
| 83 |
if is-flagq "-O3" ; then |
| 84 |
echo |
| 85 |
@@ -76,8 +78,8 @@ |
| 86 |
|
| 87 |
src_configure() { |
| 88 |
export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}" |
| 89 |
- # set ./configure options (prefix, Qt based wizard, docdir) |
| 90 |
|
| 91 |
+ # set ./configure options (prefix, Qt based wizard, docdir) |
| 92 |
local my_conf="" |
| 93 |
if use debug; then |
| 94 |
my_conf="--prefix /usr --debug" |
| 95 |
@@ -92,21 +94,23 @@ |
| 96 |
|
| 97 |
if use qt4; then |
| 98 |
export QTDIR="/usr" |
| 99 |
- einfo "using QTDIR: '$QTDIR'." |
| 100 |
export LIBRARY_PATH="${QTDIR}/$(get_libdir):${LIBRARY_PATH}" |
| 101 |
export LD_LIBRARY_PATH="${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}" |
| 102 |
- einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'." |
| 103 |
- einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'." |
| 104 |
./configure ${my_conf} $(use_with qt4 doxywizard) \ |
| 105 |
|| die 'configure with qt4 failed' |
| 106 |
else |
| 107 |
./configure ${my_conf} || die 'configure failed' |
| 108 |
fi |
| 109 |
+ |
| 110 |
+ # this appears to work as a fix for the final ignoring LDFLAGS issue... |
| 111 |
+ pushd "${S}"/addon/doxywizard |
| 112 |
+ eqmake4 "CONFIG+=nostrip" doxywizard.pro -o Makefile.doxywizard |
| 113 |
+ popd |
| 114 |
} |
| 115 |
|
| 116 |
src_compile() { |
| 117 |
# and compile |
| 118 |
- emake LDFLAGS="${LDFLAGS}" all || die 'emake failed' |
| 119 |
+ emake all || die 'emake failed' |
| 120 |
|
| 121 |
# generate html and pdf (if tetex in use) documents. |
| 122 |
# errors here are not considered fatal, hence the ewarn message |
| 123 |
@@ -144,7 +148,7 @@ |
| 124 |
if use qt4; then |
| 125 |
doicon "${FILESDIR}/doxywizard.png" |
| 126 |
make_desktop_entry doxywizard "DoxyWizard ${PV}" \ |
| 127 |
- "doxywizard.png" "Application;Development" |
| 128 |
+ "doxywizard" "Application;Development" |
| 129 |
fi |
| 130 |
|
| 131 |
dodoc INSTALL LANGUAGE.HOWTO README |
Archives