diff options
| author |   Steve Arnold <nerdboy@gentoo.org> | 2010-10-02 18:21:55 +0000 |
|---|---|---|
| committer | Steve Arnold <nerdboy@gentoo.org> | 2010-10-02 18:21:55 +0000 |
| commit | ca792c06a1c6ff506cb5f34f55f6d0e0d48c1b78 (patch) | |
| tree | de532a8503c7483767405a1a94663848f70bd5f3 /app-doc | |
| parent | Marked ~x64-macos, bug #333981 (diff) | |
| download | gentoo-2-ca792c06a1c6ff506cb5f34f55f6d0e0d48c1b78.tar.gz gentoo-2-ca792c06a1c6ff506cb5f34f55f6d0e0d48c1b78.tar.bz2 gentoo-2-ca792c06a1c6ff506cb5f34f55f6d0e0d48c1b78.zip | |
Updated LDFLAGS and EAPI for QA bug 336736.
(Portage version: 2.2_rc88/cvs/Linux x86_64)
Diffstat (limited to 'app-doc')
| -rw-r--r-- | app-doc/doxygen/ChangeLog | 5 | ||||
| -rw-r--r-- | app-doc/doxygen/doxygen-1.5.8-r1.ebuild | 17 |
2 files changed, 12 insertions, 10 deletions
diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog index 23edb8a3d268..69e251ce8216 100644 --- a/app-doc/doxygen/ChangeLog +++ b/app-doc/doxygen/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-doc/doxygen # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.179 2010/09/29 02:34:43 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.180 2010/10/02 18:21:55 nerdboy Exp $ + + 02 Oct 2010; Steve Arnold <nerdboy@gentoo.org> doxygen-1.5.8-r1.ebuild: + Updated LDFLAGS and EAPI; closes QA bug #336736. 29 Sep 2010; Steve Arnold <nerdboy@gentoo.org> doxygen-1.7.1.ebuild: Added minor upstream latex doc fix (only affects package PDF docs). diff --git a/app-doc/doxygen/doxygen-1.5.8-r1.ebuild b/app-doc/doxygen/doxygen-1.5.8-r1.ebuild index 1230c6116749..3e4c1f663157 100644 --- a/app-doc/doxygen/doxygen-1.5.8-r1.ebuild +++ b/app-doc/doxygen/doxygen-1.5.8-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $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 $ +# $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 $ -EAPI=1 +EAPI=2 -inherit eutils flag-o-matic toolchain-funcs qt4 fdo-mime +inherit eutils flag-o-matic toolchain-funcs qt4-r2 fdo-mime DESCRIPTION="documentation system for C++, C, Java, Objective-C, Python, IDL, and other languages" HOMEPAGE="http://www.doxygen.org/" @@ -34,10 +34,7 @@ DEPEND=">=sys-apps/sed-4 EPATCH_SUFFIX="patch" -src_unpack() { - unpack ${A} - cd "${S}" - +src_prepare() { # use CFLAGS, CXXFLAGS, LDFLAGS sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \ -e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \ @@ -77,7 +74,7 @@ src_unpack() { fi } -src_compile() { +src_configure() { export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}" # set ./configure options (prefix, Qt based wizard, docdir) @@ -105,9 +102,11 @@ src_compile() { else ./configure ${my_conf} || die 'configure failed' fi +} +src_compile() { # and compile - emake all || die 'emake failed' + emake LDFLAGS="${LDFLAGS}" all || die 'emake failed' # generate html and pdf (if tetex in use) documents. # errors here are not considered fatal, hence the ewarn message |