diff options
| author |   Steve Arnold <nerdboy@gentoo.org> | 2010-12-21 19:17:54 +0000 |
|---|---|---|
| committer | Steve Arnold <nerdboy@gentoo.org> | 2010-12-21 19:17:54 +0000 |
| commit | d8abaaad98bb49f835409e4fef11a8c565d51896 (patch) | |
| tree | 3b2d21aadc60faa016204241f95b4a677ec5e884 /app-doc | |
| parent | x86 stable wrt bug #349223 (diff) | |
| download | historical-d8abaaad98bb49f835409e4fef11a8c565d51896.tar.gz historical-d8abaaad98bb49f835409e4fef11a8c565d51896.tar.bz2 historical-d8abaaad98bb49f835409e4fef11a8c565d51896.zip | |
Updated anti-flag mangling per bug 348629 (artifact of EAPI update).
Package-Manager: portage-2.1.9.25/cvs/Linux x86_64
Diffstat (limited to 'app-doc')
| -rw-r--r-- | app-doc/doxygen/ChangeLog | 7 | ||||
| -rw-r--r-- | app-doc/doxygen/Manifest | 4 | ||||
| -rw-r--r-- | app-doc/doxygen/doxygen-1.7.2.ebuild | 9 |
3 files changed, 14 insertions, 6 deletions
diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog index d0a63cf0b51b..b607d50384bb 100644 --- a/app-doc/doxygen/ChangeLog +++ b/app-doc/doxygen/ChangeLog @@ -1,6 +1,11 @@ # 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.186 2010/12/20 13:27:16 klausman Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.187 2010/12/21 19:17:54 nerdboy Exp $ + + 21 Dec 2010; Steve Arnold <nerdboy@gentoo.org> doxygen-1.7.2.ebuild: + Updated anti-flag mangling per bug 348629 (artifact of EAPI update). But + even with some extra massaging (and brute force sedding) doxywizard is + being stubborn with all that tmake/qmake on-the-fly writing of things... 20 Dec 2010; Tobias Klausmann <klausman@gentoo.org> doxygen-1.7.2.ebuild: Stable on alpha, bug #338632 diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest index 554bd90bf323..e1dfc0f2d332 100644 --- a/app-doc/doxygen/Manifest +++ b/app-doc/doxygen/Manifest @@ -36,6 +36,6 @@ EBUILD doxygen-1.6.1.ebuild 5327 RMD160 5cae97bf462e0ca2bb58ad9cabf6893a688be2c0 EBUILD doxygen-1.6.2.ebuild 5146 RMD160 30e58447ad9b12b69893eec1c2a31e6cafb01719 SHA1 57f17659d5d902a005f647d991206084ebcd4c1f SHA256 af0c0b5216a59ce9aaa0978bfc11a900e84b401839c619f3222c81397978f610 EBUILD doxygen-1.6.3.ebuild 5153 RMD160 96721b42675af763276f72298215d201e2daf072 SHA1 635cb35dfd0c4211d7ae9baab8ccba6247915535 SHA256 c4371ceabf44d69fccb34066f662a5e6a3723d3e4efbf25820709d7ffbd577ec EBUILD doxygen-1.7.1.ebuild 5249 RMD160 60f6f651029c9410d4cc5019eac12c78ca3b2a2e SHA1 ac8c7ae7aeb053945fbf40b6522ab214edc35dc3 SHA256 afad9f53aca6de69123d7ab108594d39cc913a151682903850a94c8b10d9c343 -EBUILD doxygen-1.7.2.ebuild 5428 RMD160 ef95ecd0a2f01dcb1bdcfba0d0284d89f2895bf2 SHA1 fa6480f5a0802a29d3a8918c9bdf8425b6962499 SHA256 9d82bef1588baefeb1bcfa17b51853301f4c4491be78baa91d9beb245d6c79c7 -MISC ChangeLog 31643 RMD160 deb54dbc89bc2540c7331df3bdbb1c70ebbe9a0d SHA1 7c09deda24dc8e1dfdb82f0b2e982d45e0ebed7e SHA256 2ef4dbf1bc9cdefca8e49f24f960795f60fd994a5884bf42ea985db1becebb0b +EBUILD doxygen-1.7.2.ebuild 5501 RMD160 037143030635b17e6d164e05b461695c73999407 SHA1 15c719a953ffe839227ae49d00cd0e92028a3949 SHA256 9638e61f0f3ec9ec6faba4a662e24e266492dd6cf19a2adc624925fe26e4c45f +MISC ChangeLog 31938 RMD160 68dfe09a2f14a0db6f905f75b8c61ad7f1aa4147 SHA1 d418bacc295b7e04c21b4a5a426197229111ac27 SHA256 5dd80ab2282a70d2a075f7a278df3315da58c57b741d5daf165eb30c824bb664 MISC metadata.xml 831 RMD160 1a40ce1c3afecb14f2706c413b0d4a4fea3bb55f SHA1 258d06797a0b59edab6716e9ead66bb7df6b0e6e SHA256 802686f997f166ad02f46f8abc382dace5b23bac8db51c5f4a963afa3f75a6e2 diff --git a/app-doc/doxygen/doxygen-1.7.2.ebuild b/app-doc/doxygen/doxygen-1.7.2.ebuild index c0c6fec4b931..52e89cf79c1e 100644 --- a/app-doc/doxygen/doxygen-1.7.2.ebuild +++ b/app-doc/doxygen/doxygen-1.7.2.ebuild @@ -1,6 +1,6 @@ # 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.7.2.ebuild,v 1.3 2010/12/20 13:27:16 klausman Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.7.2.ebuild,v 1.4 2010/12/21 19:17:54 nerdboy Exp $ EAPI=3 @@ -33,6 +33,8 @@ EPATCH_SUFFIX="patch" src_prepare() { # use CFLAGS, CXXFLAGS, LDFLAGS + export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}" + sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \ -e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \ -e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \ @@ -75,7 +77,6 @@ src_prepare() { } src_configure() { - export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}" # set ./configure options (prefix, Qt based wizard, docdir) local my_conf="" @@ -93,6 +94,7 @@ src_configure() { export LD_LIBRARY_PATH="${QTDIR}/$(get_libdir)${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}" einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'." einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'." + ./configure --prefix "${EPREFIX}/usr" ${my_conf} $(use_with qt4 doxywizard) \ || die 'configure with qt4 failed' else @@ -101,7 +103,8 @@ src_configure() { } src_compile() { - emake all || die 'emake failed' + CFLAGS+="${ECFLAGS}" CXXFLAGS+="${ECXXFLAGS}" LFLAGS+="${ELDFLAGS}" \ + emake all || die 'emake failed' # generate html and pdf (if tetex in use) documents. # errors here are not considered fatal, hence the ewarn message |